SPECS: ipw2200.spec - update rpmbuild(macros) - remove smp stuff

[rotom]

Author: rotom                        Date: Fri Mar 23 09:04:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update rpmbuild(macros)
- remove smp stuff

---- Files affected:
SPECS:
   ipw2200.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/ipw2200.spec
diff -u SPECS/ipw2200.spec:1.78 SPECS/ipw2200.spec:1.79
--- SPECS/ipw2200.spec:1.78	Tue Feb 13 09:06:35 2007
+++ SPECS/ipw2200.spec	Fri Mar 23 10:04:28 2007
@@ -9,8 +9,6 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	smp		# don't build SMP module
-%bcond_without	up		# don't build UP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_rel	1
@@ -32,7 +30,7 @@
 URL:		http://ipw2200.sourceforge.net/
 BuildRequires:	ieee80211-devel >= %{_ieeever}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 Requires:	ipw2200-firmware = %{_fwver}
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,7 +56,7 @@
 Requires:	hotplug
 Requires:	ipw2200-firmware = %{_fwver}
 %(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_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
 
@@ -74,31 +72,6 @@
 Ten pakiet zawiera sterowniki jądra Linuksa dla kart Intel(R)
 PRO/Wireless 2200 oraz 2915.
 
-%package -n kernel%{_alt_kernel}-smp-net-%{name}
-Summary:	Linux SMP kernel module for the Intel(R) PRO/Wireless 2200
-Summary(de.UTF-8):	Linux SMP Kernel Modul für Intel(R) PRO/Wireless 2200 Netzwerkkarten
-Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla kart Intel(R) PRO/Wireless 2200
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires:	hotplug
-Requires:	ipw2200-firmware = %{_fwver}
-%(rpm -q --qf 'Requires: kernel%{_alt_kernel}-smp-net-ieee80211 = %%{epoch}:%%{version}-%%{release}\n' ieee80211-devel | sed -e 's/ (none):/ /' | grep -v "is not")
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Requires:	module-init-tools >= 3.2.2-2
-
-%description -n kernel%{_alt_kernel}-smp-net-%{name}
-This package contains Linux SMP kernel drivers for the Intel(R)
-PRO/Wireless 2200 and 2915.
-
-%description -n kernel%{_alt_kernel}-smp-net-%{name} -l de.UTF-8
-Dieses Paket enthält Linux SMP Kernel Treiber für Intel(R)
-PRO/Wireless 2200 und 2915 Netzwerkkarten.
-
-%description -n kernel%{_alt_kernel}-smp-net-%{name} -l pl.UTF-8
-Ten pakiet zawiera sterowniki jądra Linuksa SMP dla kart Intel(R)
-PRO/Wireless 2200 oraz 2915.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -122,30 +95,21 @@
 %postun	-n kernel%{_alt_kernel}-net-%{name}
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-%{name}
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-net-%{name}
-%depmod %{_kernel_ver}smp
-
 %files -n kernel%{_alt_kernel}-net-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/ipw2200-%{_mod_suffix}.ko*
 %{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-%{name}
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/ipw2200-%{_mod_suffix}.ko*
-%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/%{name}.conf
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2007/03/23 09:04:28  rotom
+- update rpmbuild(macros)
+- remove smp stuff
+
 Revision 1.78  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ipw2200.spec?r1=1.78&r2=1.79&f=u