SPECS: ndiswrapper.spec - use %build_kernel_modules and %install_k...

Fri Nov 24 03:04:24 CET 2006

Author: sparky                       Date: Fri Nov 24 02:04:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %build_kernel_modules and %install_kernel_modules
- %{_alt_kernel} support

---- Files affected:
SPECS:
   ndiswrapper.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.79 SPECS/ndiswrapper.spec:1.80

--- SPECS/ndiswrapper.spec:1.79	Fri Nov 24 02:14:33 2006
+++ SPECS/ndiswrapper.spec	Fri Nov 24 03:04:18 2006
@@ -25,8 +25,8 @@
 %ifarch %{ix86}
 BuildRequires:	gcc >= 5:3.4
 %endif
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.8}
-BuildRequires:	rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.8}
+BuildRequires:	rpmbuild(macros) >= 1.330
 %endif
 BuildRequires:	sed >= 4.0
 ExclusiveArch:	%{ix86} %{x8664}
@@ -52,7 +52,7 @@
 Główny pakiet zawiera narzędzia przestrzeni użytkownika dla
 ndiswrappera.
 
-%package -n kernel-net-ndiswrapper
+%package -n kernel%{_alt_kernel}-net-ndiswrapper
 Summary:	Loadable Linux kernel module that "wraps around" NDIS drivers
 Summary(pl):	Moduł jądra Linuksa "owijający" sterowniki NDIS
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -65,7 +65,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{_rel}
 Requires:	dev >= 2.7.7-10
 
-%description -n kernel-net-ndiswrapper
+%description -n kernel%{_alt_kernel}-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
@@ -74,7 +74,7 @@
 
 This package contains Linux kernel module.
 
-%description -n kernel-net-ndiswrapper -l pl
+%description -n kernel%{_alt_kernel}-net-ndiswrapper -l pl
 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
@@ -83,7 +83,7 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel-smp-net-ndiswrapper
+%package -n kernel%{_alt_kernel}-smp-net-ndiswrapper
 Summary:	Loadable Linux SMP kernel module that "wraps around" NDIS drivers
 Summary(pl):	Moduł jądra Linuksa SMP "owijający" sterowniki NDIS
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -96,7 +96,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{_rel}
 Requires:	dev >= 2.7.7-10
 
-%description -n kernel-smp-net-ndiswrapper
+%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
@@ -105,7 +105,7 @@
 
 This package contains Linux SMP kernel module.
 
-%description -n kernel-smp-net-ndiswrapper -l pl
+%description -n kernel%{_alt_kernel}-smp-net-ndiswrapper -l pl
 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
@@ -130,34 +130,18 @@
 
 %if %{with kernel}
 cd driver
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	install -d o/include/linux
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts \
-		KVERS="%{_kernel_ver}" \
-
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD/o \
-		KVERS="%{_kernel_ver}" \
-		%{?with_verbose:V=1}
-
-	%{__make} KBUILD=%{_kernelsrcdir} \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD/o \
-		KVERS="%{_kernel_ver}" \
+%{__make} win2lin_stubs.h gen_exports \
 %ifarch %{x8664}
-		CONFIG_X86_64=y \
+	CONFIG_X86_64=y \
+%endif
+	KBUILD="%{_kernelsrcdir}"
+
+%build_kernel_modules -m ndiswrapper \
+%ifarch %{x8664}
+	CONFIG_X86_64=y \
 %endif
-		%{?with_verbose:V=1}
-	 mv ndiswrapper{,-$cfg}.ko
-done
+	KBUILD="%{_kernelsrcdir}" \
+	KVERS="%{_kernel_ver}"
 %endif
 
 %install
@@ -172,29 +156,22 @@
 %endif
 
 %if %{with kernel}
-cd driver
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install ndiswrapper-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/ndiswrapper.ko
-%if %{with smp} && %{with dist_kernel}
-install ndiswrapper-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/ndiswrapper.ko
-%endif
+%install_kernel_modules -m driver/ndiswrapper -d misc
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n kernel-net-ndiswrapper
+%post	-n kernel%{_alt_kernel}-net-ndiswrapper
 %depmod %{_kernel_ver}
 
-%postun	-n kernel-net-ndiswrapper
+%postun	-n kernel%{_alt_kernel}-net-ndiswrapper
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-net-ndiswrapper
+%post	-n kernel%{_alt_kernel}-smp-net-ndiswrapper
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-ndiswrapper
+%postun -n kernel%{_alt_kernel}-smp-net-ndiswrapper
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -207,12 +184,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-net-ndiswrapper
+%files -n kernel%{_alt_kernel}-net-ndiswrapper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/ndiswrapper.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-ndiswrapper
+%files -n kernel%{_alt_kernel}-smp-net-ndiswrapper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/ndiswrapper.ko*
 %endif
@@ -224,6 +201,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2006/11/24 02:04:18  sparky
+- use %build_kernel_modules and %install_kernel_modules
+- %{_alt_kernel} support
+
 Revision 1.79  2006/11/24 01:14:33  shadzik
 - 1.29
 
================================================================

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

