SPECS: softmac.spec - use new kernel macros - remove smp stuff

[shadzik]

Author: shadzik                      Date: Sun Mar 25 22:56:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros
- remove smp stuff

---- Files affected:
SPECS:
   softmac.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/softmac.spec
diff -u SPECS/softmac.spec:1.21 SPECS/softmac.spec:1.22
--- SPECS/softmac.spec:1.21	Tue Feb 27 12:45:54 2007
+++ SPECS/softmac.spec	Mon Mar 26 00:56:29 2007
@@ -3,15 +3,9 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%ifarch sparc
-%undefine	with_smp
-%endif
-#
 %define		_snap	20060319
 %define		_rel	0.%{_snap}.1
 Summary:	Layer intended to be a software MAC layer
@@ -27,7 +21,7 @@
 Patch0:		%{name}-local_headers.patch
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRequires:	sed >= 4.0
 Requires(post,postun):	/sbin/depmod
@@ -67,8 +61,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 
 %description -n kernel%{_alt_kernel}-net-softmac
@@ -88,34 +82,6 @@
 
 Ten pakiet zawiera sterowniki jądra Linuksa.
 
-%package -n kernel%{_alt_kernel}-smp-net-softmac
-Summary:	Software MAC layer - Linux SMP kernel drivers
-Summary(pl.UTF-8):	Programowa warstwa MAC - sterowniki jądra Linuksa SMP
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-net-softmac
-The ieee80211 softmac layer is intended to be a software MAC layer
-complementing ieee80211 layer in Linux with protocol management
-features that a lot of hardware no longer does but instead hands off
-to software. It is intended to handle scanning, assocation and similar
-tasks.
-
-This package contains Linux SMP kernel drivers.
-
-%description -n kernel%{_alt_kernel}-smp-net-softmac -l pl.UTF-8
-softmac ma być programową warstwą MAC zgodną z warstwą ieee80211 w
-Linuksie z opcjami zarządzania protokołem, których znaczna część
-sprzętu już nie obsługuje, ale pozostawia oprogramowaniu. Ma
-obsługiwać skanowanie, kojarzenie i podobne zadania.
-
-Ten pakiet zawiera sterowniki jądra Linuksa SMP.
-
 %prep
 %setup -q -n %{name}-snapshot
 %patch0 -p1
@@ -151,12 +117,6 @@
 %postun	-n kernel%{_alt_kernel}-net-softmac
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-softmac
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-softmac
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files devel
 %defattr(644,root,root,755)
@@ -164,7 +124,6 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-softmac
 %defattr(644,root,root,755)
 %dir /lib/modules/%{_kernel_ver}/kernel/net/ieee80211-%{name}
@@ -174,23 +133,16 @@
 %{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-softmac
-%defattr(644,root,root,755)
-%dir /lib/modules/%{_kernel_ver}smp/kernel/net/ieee80211-%{name}
-/lib/modules/%{_kernel_ver}smp/kernel/net/ieee80211-%{name}/*.ko*
-%dir /lib/modules/%{_kernel_ver}smp/kernel/net/ieee80211-%{name}/%{name}
-/lib/modules/%{_kernel_ver}smp/kernel/net/ieee80211-%{name}/%{name}/ieee80211softmac.ko*
-%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/%{name}.conf
-%endif
-%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.22  2007/03/25 22:56:29  shadzik
+- use new kernel macros
+- remove smp stuff
+
 Revision 1.21  2007/02/27 11:45:54  sparky
 - without up bcond
 - fixed %files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/softmac.spec?r1=1.21&r2=1.22&f=u