SPECS: iwlwifi.spec - separate 2 types of modules

[blues]

Author: blues                        Date: Sun Oct 14 09:54:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separate 2 types of modules

---- Files affected:
SPECS:
   iwlwifi.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/iwlwifi.spec
diff -u SPECS/iwlwifi.spec:1.1 SPECS/iwlwifi.spec:1.2
--- SPECS/iwlwifi.spec:1.1	Sat Oct 13 22:43:00 2007
+++ SPECS/iwlwifi.spec	Sun Oct 14 11:54:17 2007
@@ -3,9 +3,7 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel	0.1
-#%define		_ieeever	1.2.17
-#%define		_fwver	3.0
+%define		_rel	0.2
 %define		_mod_suffix	current
 Summary:	Intel® Wireless WiFi Link 4965AGN and Intel® PRO/Wireless 3945ABG Network Connection
 Name:		iwlwifi
@@ -16,10 +14,8 @@
 Source0:	http://www.intellinuxwireless.org/iwlwifi/downloads/%{name}-%{version}.tgz
 # Source0-md5:	8c0ab70d569ae92315813855137d065f
 URL:		http://www.intellinuxwireless.org/
-#BuildRequires:	ieee80211-devel >= %{_ieeever}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
-#Requires:	ipw2200-firmware = %{_fwver}
 #ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,12 +29,27 @@
 regulatory daemon. This change should help to simplify installation,
 development, and redistribution of this driver package.
 
-%package -n kernel%{_alt_kernel}-net-%{name}
-Summary:	Intel® Wireless WiFi Link 4965AGN and Intel® PRO/Wireless 3945ABG Network Connection
+%package -n kernel%{_alt_kernel}-net-iwl3945
+Summary:	Intel® PRO/Wireless 3945ABG Network Connection
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires:	hotplug
-#Requires:	ipw2200-firmware = %{_fwver}
+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
+
+%description -n kernel%{_alt_kernel}-net-%{name}
+This package contains Linux kernel drivers for the IntelÂ
+PRO/Wireles 3945ABG Network Connection.
+
+%package -n kernel%{_alt_kernel}-net-iwl4965
+Summary:	Intel® Wireless WiFi Link 4965AG
+Release:	%{_rel}@%{_kernel_ver_str}
+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
@@ -46,7 +57,7 @@
 
 %description -n kernel%{_alt_kernel}-net-%{name}
 This package contains Linux kernel drivers for the Intel® Wireless WiFi
-Link 4965AGN and Intel® PRO/Wireless 3945ABG Network Connection.
+Link 4965AGN.
 
 %prep
 %setup -q
@@ -69,10 +80,15 @@
 %postun	-n kernel%{_alt_kernel}-net-%{name}
 %depmod %{_kernel_ver}
 
-%files -n kernel%{_alt_kernel}-net-%{name}
+%files -n kernel%{_alt_kernel}-net-iwl3945
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-#%{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
+/lib/modules/%{_kernel_ver}/misc/iwl3945.ko*
+#%{_sysconfdir}/modprobe.d/%{_kernel_ver}/iwl3945.conf
+
+%files -n kernel%{_alt_kernel}-net-iwl4965
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/iwl4965.ko*
+#%{_sysconfdir}/modprobe.d/%{_kernel_ver}/iwl4965.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -80,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/10/14 09:54:17  blues
+- separate 2 types of modules
+
 Revision 1.1  2007/10/13 20:43:00  blues
 - initial, NFY
 
================================================================

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