Author: hawk Date: Wed Jan 23 17:46:40 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- suffix src package with alt kernel name (if present)
- disable userspace for alt_kernels
---- Files affected:
SPECS:
madwifi-ng.spec (1.64 -> 1.65)
---- Diffs:
================================================================
Index: SPECS/madwifi-ng.spec
diff -u SPECS/madwifi-ng.spec:1.64 SPECS/madwifi-ng.spec:1.65
--- SPECS/madwifi-ng.spec:1.64 Tue Jan 22 23:54:32 2008
+++ SPECS/madwifi-ng.spec Wed Jan 23 18:46:35 2008
@@ -17,9 +17,16 @@
%define trunk r2799
%define rel 8
+
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
+%endif
+
+%define pname madwifi-ng
+
Summary: Atheros WiFi card driver
Summary(pl.UTF-8): Sterownik karty radiowej Atheros
-Name: madwifi-ng
+Name: %{pname}%{_alt_kernel}
Version: 0
Release: %{prel}
License: GPL/BSD (partial source)
@@ -27,14 +34,14 @@
Provides: madwifi
Obsoletes: madwifi
# http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2362-20070522.tar.gz
-Source0:
http://snapshots.madwifi.org/madwifi-ng/%{name}-%{trunk}-%{snap}.tar.gz
+Source0:
http://snapshots.madwifi.org/madwifi-ng/%{pname}-%{trunk}-%{snap}.tar.gz
# Source0-md5: 58fdb5d5acf73ccd4577f17fbd7c6a22
# http://patches.aircrack-ng.org/madwifi-ng-r1886.patch
-Patch0: %{name}-r1886.patch
+Patch0: %{pname}-r1886.patch
# needed when build against (more noisy) pax enabled kernel
-Patch1: %{name}-makefile-werror.patch
+Patch1: %{pname}-makefile-werror.patch
# http://madwifi.org/ticket/617
-Patch2: %{name}-ticket-617.patch
+Patch2: %{pname}-ticket-617.patch
URL: http://www.madwifi.org/
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.20.2}
@@ -90,7 +97,7 @@
Ten pakiet zawiera moduł jądra Linuksa.
%prep
-%setup -q -n %{name}-%{trunk}-%{snap}
+%setup -q -n %{pname}-%{trunk}-%{snap}
# airckrack-ng
%patch0 -p1
# werror
@@ -192,6 +199,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.65 2008-01-23 17:46:35 hawk
+- suffix src package with alt kernel name (if present)
+- disable userspace for alt_kernels
+
Revision 1.64 2008-01-22 22:54:32 glen
- rel 8 (2.6.16.59-2)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/madwifi-ng.spec?r1=1.64&r2=1.65&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
