packages: madwifi-ng/madwifi-ng.spec - rel 3 - drop our -(non)dist kernel m...

[baggins]

Author: baggins                      Date: Mon Feb 13 21:52:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- drop our -(non)dist kernel module build hacks

---- Files affected:
packages/madwifi-ng:
   madwifi-ng.spec (1.198 -> 1.199) 

---- Diffs:

================================================================
Index: packages/madwifi-ng/madwifi-ng.spec
diff -u packages/madwifi-ng/madwifi-ng.spec:1.198 packages/madwifi-ng/madwifi-ng.spec:1.199
--- packages/madwifi-ng/madwifi-ng.spec:1.198	Mon Feb 13 22:04:28 2012
+++ packages/madwifi-ng/madwifi-ng.spec	Mon Feb 13 22:52:15 2012
@@ -19,7 +19,7 @@
 %define		prel	0.%{snap}.%{rel}
 %define		trunk	r4177
 
-%define		rel		2
+%define		rel		3
 
 %if "%{_alt_kernel}" != "%{nil}"
 %if %{with kernel}
@@ -57,8 +57,8 @@
 Patch3:		%{pname}-ieee80211-skb-update.patch
 URL:		http://madwifi-project.org/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires:	rpmbuild(macros) >= 1.379
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:3.0.21}
+BuildRequires:	rpmbuild(macros) >= 1.642
 %endif
 ExclusiveArch:	alpha arm %{ix86} %{x8664} mips powerpc ppc sparc sparcv9 sparc64 xscale
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -123,7 +123,7 @@
 %{__make} -C tools \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
-	KERNELCONF="%{_kernelsrcdir}/config-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}"
+	KERNELPATH="%{_kernelsrcdir}"
 %endif
 
 %ifarch alpha %{ix86} %{x8664}
@@ -144,7 +144,7 @@
 %define modules_wlan net80211/wlan,net80211/wlan_{wep,xauth,acl,ccmp,tkip,scan_{ap,sta}}
 %define modules %{modules_ath},%{modules_wlan}
 
-%define opts TARGET=%{target} KERNELPATH="%{_kernelsrcdir}" KERNELCONF="%{_kernelsrcdir}/config-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}" TOOLPREFIX= LDFLAGS_MODULE=
+%define opts TARGET=%{target} KERNELPATH="%{_kernelsrcdir}" TOOLPREFIX= LDFLAGS_MODULE=
 
 %{__make} %{opts}  svnversion.h
 %build_kernel_modules -c -m %{modules} %{opts} <<'EOF'
@@ -162,7 +162,6 @@
 
 %{__make} install-tools \
 	TARGET=%{target} \
-	KERNELCONF="%{_kernelsrcdir}/config-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}" \
 	KERNELPATH="%{_kernelsrcdir}" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir} \
@@ -212,6 +211,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.199  2012/02/13 21:52:15  baggins
+- rel 3
+- drop our -(non)dist kernel module build hacks
+
 Revision 1.198  2012/02/13 21:04:28  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/madwifi-ng/madwifi-ng.spec?r1=1.198&r2=1.199&f=u