SPECS: iwlwifi.spec - don't build it twice

blues blues at pld-linux.org
Sun Oct 14 20:56:17 CEST 2007


Author: blues                        Date: Sun Oct 14 18:56:17 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't build it twice

---- Files affected:
SPECS:
   iwlwifi.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/iwlwifi.spec
diff -u SPECS/iwlwifi.spec:1.3 SPECS/iwlwifi.spec:1.4
--- SPECS/iwlwifi.spec:1.3	Sun Oct 14 12:13:45 2007
+++ SPECS/iwlwifi.spec	Sun Oct 14 20:56:12 2007
@@ -3,7 +3,7 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel	0.2
+%define		_rel	0.3
 %define		_mod_suffix	current
 Summary:	Intel® Wireless WiFi Link 4965AGN and Intel® PRO/Wireless 3945ABG Network Connection
 Name:		iwlwifi
@@ -35,7 +35,6 @@
 Group:		Base/Kernel
 Requires:	hotplug
 Requires:	iwlwifi-3945-ucode
-#%(rpm -q --qf 'Requires: kernel%{_alt_kernel}-net-ieee80211 = %%{epoch}:%%{version}-%%{release}\n' ieee80211-devel | sed -e 's/ (none):/ /' | grep -v "is not")
 %{?with_dist_kerqnel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
@@ -50,7 +49,6 @@
 Group:		Base/Kernel
 Requires:	hotplug
 Requires:	iwlwifi-4965-ucode
-#%(rpm -q --qf 'Requires: kernel%{_alt_kernel}-net-ieee80211 = %%{epoch}:%%{version}-%%{release}\n' ieee80211-devel | sed -e 's/ (none):/ /' | grep -v "is not")
 %{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
@@ -63,8 +61,7 @@
 %setup -q
 
 %build
-%build_kernel_modules -m iwl3945 -p SHELL=/bin/bash
-%build_kernel_modules -m iwl4965 -p SHELL=/bin/bash
+%build_kernel_modules -m iwl3945,iwl4965 -p SHELL=/bin/bash
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007/10/14 18:56:12  blues
+- don't build it twice
+
 Revision 1.3  2007/10/14 10:13:45  blues
 - small fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iwlwifi.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list