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

[shadzik]

Author: shadzik                      Date: Thu Mar 29 15:46:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros
- remove smp stuff

---- Files affected:
SPECS:
   ndiswrapper.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.90 SPECS/ndiswrapper.spec:1.91
--- SPECS/ndiswrapper.spec:1.90	Fri Mar 16 00:36:20 2007
+++ SPECS/ndiswrapper.spec	Thu Mar 29 17:46:29 2007
@@ -4,8 +4,6 @@
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace tools
-%bcond_without	smp		# don't build SMP module
-%bcond_without	up		# don't build UP module
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
@@ -31,7 +29,7 @@
 BuildRequires:	gcc >= 5:3.4
 %endif
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.8}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRequires:	sed >= 4.0
 ExclusiveArch:	%{ix86} %{x8664}
@@ -64,8 +62,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
 Requires:	%{name} = %{epoch}:%{version}-%{_rel}
 Requires:	dev >= 2.7.7-10
@@ -88,37 +86,6 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-Summary:	Loadable Linux SMP kernel module that "wraps around" NDIS drivers
-Summary(pl.UTF-8):	Moduł jądra Linuksa SMP "owijający" sterowniki NDIS
-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
-Requires:	%{name} = %{epoch}:%{version}-%{_rel}
-Requires:	dev >= 2.7.7-10
-
-%description -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-Some wireless LAN vendors refuse to release hardware specifications or
-drivers for their products for operating systems other than Microsoft
-Windows. The ndiswrapper project makes it possible to use such
-hardware with Linux by means of a loadable kernel module that "wraps
-around" NDIS (Windows network driver API) drivers.
-
-This package contains Linux SMP kernel module.
-
-%description -n kernel%{_alt_kernel}-smp-net-ndiswrapper -l pl.UTF-8
-Niektórzy producenci bezprzewodowych kart sieciowych nie udostępniają
-specyfikacji lub sterowników dla swoich produktów, dla systemów innych
-niż Microsoft Windows. Projekt ndiswrapper umożliwia użycie takiego
-sprzętu w systemie Linux, dostarczając moduł jądra który "owija"
-sterowniki NDIS (API sterowników sieciowych w Windows).
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q
 %{__sed} -i -e 's#"loader.h"#"../driver/loader.h"#g' utils/loadndisdriver.c
@@ -173,12 +140,6 @@
 %postun	-n kernel%{_alt_kernel}-net-ndiswrapper
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-ndiswrapper
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -189,18 +150,9 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-ndiswrapper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/ndiswrapper.ko*
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-ndiswrapper
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/ndiswrapper.ko*
-%endif
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -208,6 +160,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2007/03/29 15:46:29  shadzik
+- use new kernel macros
+- remove smp stuff
+
 Revision 1.90  2007/03/15 23:36:20  glen
 - fix smp only %files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ndiswrapper.spec?r1=1.90&r2=1.91&f=u