SPECS: kernel-net-e1000.spec, madwifi.spec - alternative kernel su...

adamg adamg at pld-linux.org
Sat Jun 24 20:39:15 CEST 2006 

Author: adamg                        Date: Sat Jun 24 18:39:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alternative kernel support

---- Files affected:
SPECS:
   kernel-net-e1000.spec (1.48 -> 1.49) , madwifi.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-e1000.spec
diff -u SPECS/kernel-net-e1000.spec:1.48 SPECS/kernel-net-e1000.spec:1.49
--- SPECS/kernel-net-e1000.spec:1.48	Tue May  9 20:08:55 2006
+++ SPECS/kernel-net-e1000.spec	Sat Jun 24 20:39:10 2006
@@ -8,7 +8,7 @@
 %define		_rel	1
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Name:		kernel-net-e1000
+Name:		kernel%{_alt_kernel}-net-e1000
 Version:	7.0.38
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
@@ -16,8 +16,8 @@
 Source0:	ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz
 # Source0-md5:	1c1c8b63e1530a68c5c73c4a39cb218b
 URL:		http://support.intel.com/support/network/adapter/index.htm#PRO/1000
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.211
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires:	rpmbuild(macros) >= 1.308
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel_up
@@ -36,7 +36,7 @@
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
-%package -n kernel-smp-net-e1000
+%package -n kernel%{_alt_kernel}-smp-net-e1000
 Summary:	Intel(R) PRO/1000 driver for Linux SMP
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -50,11 +50,11 @@
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
 
-%description -n kernel-smp-net-e1000
+%description -n kernel%{_alt_kernel}-smp-net-e1000
 This package contains the Linux SMP driver for the Intel(R) PRO/1000
 family of 10/100/1000 Ethernet network adapters.
 
-%description -n kernel-smp-net-e1000 -l pl
+%description -n kernel%{_alt_kernel}-smp-net-e1000 -l pl
 Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
@@ -133,10 +133,10 @@
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-net-e1000
+%post	-n kernel%{_alt_kernel}-smp-net-e1000
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-e1000
+%postun -n kernel%{_alt_kernel}-smp-net-e1000
 %depmod %{_kernel_ver}smp
 
 %files
@@ -145,7 +145,7 @@
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-e1000
+%files -n kernel%{_alt_kernel}-smp-net-e1000
 %defattr(644,root,root,755)
 %doc e1000.7 README ldistrib.txt
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/net/*
@@ -157,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2006/06/24 18:39:10  adamg
+- alternative kernel support
+
 Revision 1.48  2006/05/09 18:08:55  zbyniu
 - build fix; synchro options with template-kernel-module.spec
 

================================================================
Index: SPECS/madwifi.spec
diff -u SPECS/madwifi.spec:1.32 SPECS/madwifi.spec:1.33
--- SPECS/madwifi.spec:1.32	Wed Apr 19 00:22:27 2006
+++ SPECS/madwifi.spec	Sat Jun 24 20:39:10 2006
@@ -28,8 +28,8 @@
 # Source0-md5:	edb2791b3c1df2cd5db57d6a52670d62
 URL:		http://madwifi.sourceforge.net/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.153
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires:	rpmbuild(macros) >= 1.308
 BuildRequires:	sharutils
 %endif
 ExclusiveArch:	%{x8664} arm %{ix86} mips ppc xscale
@@ -54,7 +54,7 @@
 
 # kernel subpackages.
 
-%package -n kernel-net-madwifi
+%package -n kernel%{_alt_kernel}-net-madwifi
 Summary:	Linux driver for Atheros cards
 Summary(pl):	Sterownik dla Linuksa do kart Atheros
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -65,17 +65,17 @@
 Requires(postun):	%releq_kernel_up
 %endif
 
-%description -n kernel-net-madwifi
+%description -n kernel%{_alt_kernel}-net-madwifi
 This is driver for Atheros card for Linux.
 
 This package contains Linux module.
 
-%description -n kernel-net-madwifi -l pl
+%description -n kernel%{_alt_kernel}-net-madwifi -l pl
 Sterownik dla Linuksa do kart Atheros.
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel-smp-net-madwifi
+%package -n kernel%{_alt_kernel}-smp-net-madwifi
 Summary:	Linux SMP driver for %{name} cards
 Summary(pl):	Sterownik dla Linuksa SMP do kart %{name}
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -86,12 +86,12 @@
 Requires(postun):	%releq_kernel_smp
 %endif
 
-%description -n kernel-smp-net-madwifi
+%description -n kernel%{_alt_kernel}-smp-net-madwifi
 This is driver for Atheros cards for Linux.
 
 This package contains Linux SMP module.
 
-%description -n kernel-smp-net-madwifi -l pl
+%description -n kernel%{_alt_kernel}-smp-net-madwifi -l pl
 Sterownik dla Linuksa do kart Atheros.
 
 Ten pakiet zawiera moduł jądra Linuksa SMP.
@@ -212,16 +212,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n kernel-net-madwifi
+%post	-n kernel%{_alt_kernel}-net-madwifi
 %depmod %{_kernel_ver}
 
-%postun	-n kernel-net-madwifi
+%postun	-n kernel%{_alt_kernel}-net-madwifi
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-net-madwifi
+%post	-n kernel%{_alt_kernel}-smp-net-madwifi
 %depmod %{_kernel_ver}smp
 
-%postun	-n kernel-smp-net-madwifi
+%postun	-n kernel%{_alt_kernel}-smp-net-madwifi
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -237,12 +237,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-net-madwifi
+%files -n kernel%{_alt_kernel}-net-madwifi
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-madwifi
+%files -n kernel%{_alt_kernel}-smp-net-madwifi
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/net/*.ko*
 %endif
@@ -254,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2006/06/24 18:39:10  adamg
+- alternative kernel support
+
 Revision 1.32  2006/04/18 22:22:27  adamg
 - pass KERNELRELEASE
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-e1000.spec?r1=1.48&r2=1.49&f=u
    http://cvs.pld-linux.org/SPECS/madwifi.spec?r1=1.32&r2=1.33&f=u

More information about the pld-cvs-commit mailing list