SPECS: kernel-misc-nforce.spec - alternative kernel support - conv...

[sparky]

Author: sparky                       Date: Fri Jul 28 17:24:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alternative kernel support
- convert deprecated MODULE_PARM macro to module_param

---- Files affected:
SPECS:
   kernel-misc-nforce.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-nforce.spec
diff -u SPECS/kernel-misc-nforce.spec:1.24 SPECS/kernel-misc-nforce.spec:1.25
--- SPECS/kernel-misc-nforce.spec:1.24	Sun Jul  2 17:58:23 2006
+++ SPECS/kernel-misc-nforce.spec	Fri Jul 28 19:24:28 2006
@@ -14,7 +14,7 @@
 %define	_rel	4
 Summary:	Linux nForce driver
 Summary(pl):	Linuksowy sterownik do nForce
-Name:		kernel-misc-%{short_name}
+Name:		kernel%{_alt_kernel}-misc-%{short_name}
 Version:	%{ver1}.%{ver2}.%{pkg}
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	NVIDIA proprietary, distributable if unmodified (see LICENSE)
@@ -25,13 +25,14 @@
 # Source1-md5:	52295218f89f5338b88ceb40f34eb3a3
 URL:		http://www.nvidia.com/object/linux.html
 BuildRequires:	%{kgcc_package}
-%{!?without_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.213
+%{!?without_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
+BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	sed >= 4.0
 %{!?without_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-misc(nforce) = %{epoch}:%{version}-%{_rel}
-Obsoletes:	kernel-net-nforce
-Obsoletes:	kernel-sound-nforce
+Provides:	kernel%{_alt_kernel}-misc(nforce) = %{epoch}:%{version}-%{_rel}
+Obsoletes:	kernel%{_alt_kernel}-net-nforce
+Obsoletes:	kernel%{_alt_kernel}-sound-nforce
 Obsoletes:	nforce-doc
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,19 +56,19 @@
 i dźwięku ACI. Sprzęt USB i IDE jest obsługiwany przez standardowe
 sterowniki Linuksa. Winmodem nie jest obsługiwany.
 
-%package -n kernel-smp-misc-%{short_name}
+%package -n kernel%{_alt_kernel}-smp-misc-%{short_name}
 Summary:	Linux nForce driver: SMP version
 Summary(pl):	Linuksowy sterownik do nForce: wersja SMP
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{!?without_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-misc(nforce) = %{epoch}:%{version}-%{_rel}
-Obsoletes:	kernel-smp-net-nforce
-Obsoletes:	kernel-smp-sound-nforce
+Provides:	kernel%{_alt_kernel}-misc(nforce) = %{epoch}:%{version}-%{_rel}
+Obsoletes:	kernel%{_alt_kernel}-smp-net-nforce
+Obsoletes:	kernel%{_alt_kernel}-smp-sound-nforce
 Obsoletes:	nforce-doc
 
-%description -n kernel-smp-misc-%{short_name}
+%description -n kernel%{_alt_kernel}-smp-misc-%{short_name}
 This package contains SMP drivers and documentation for the nForce
 chipset. The chipset includes hardware support for IDE disk control,
 Ethernet networking, audio support, win modem support, and a USB
@@ -77,7 +78,7 @@
 networking and basic ACI audio. USB and IDE hardware will work with
 standard Linux drivers. There is no win modem support.
 
-%description -n kernel-smp-misc-%{short_name} -l pl
+%description -n kernel%{_alt_kernel}-smp-misc-%{short_name} -l pl
 Ten pakiet zawiera sterowniki SMP i dokumentację dla chipsetu nForce.
 Chipset ten zapewnia obsługę sprzętu odpowiedzialnego za dyski IDE,
 sieć Ethernet, dźwięk, winmodem oraz kontroler USB.
@@ -100,6 +101,9 @@
 %endif
 
 %build
+sed 's/MODULE_PARM(\(.*\), "i");/module_param(\1, int, 0);/' \
+	-i nvnet/nvenet.c \
+	-i nvsound/main/nvmain.c
 ln -sf Makefile.kbuild Makefile
 cp nvsound/main/nvalinux.c{,.orig}
 
@@ -166,10 +170,10 @@
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-misc-%{short_name}
+%post	-n kernel%{_alt_kernel}-smp-misc-%{short_name}
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-misc-%{short_name}
+%postun -n kernel%{_alt_kernel}-smp-misc-%{short_name}
 %depmod %{_kernel_ver}smp
 
 %files
@@ -178,7 +182,7 @@
 /lib/modules/%{_kernel_ver}/misc/*
 
 %if %{with smp}
-%files -n kernel-smp-misc-%{short_name}
+%files -n kernel%{_alt_kernel}-smp-misc-%{short_name}
 %defattr(644,root,root,755)
 %doc LICENSE pkg-history.txt ReleaseNotes*
 /lib/modules/%{_kernel_ver}smp/misc/*
@@ -190,6 +194,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/07/28 17:24:28  sparky
+- alternative kernel support
+- convert deprecated MODULE_PARM macro to module_param
+
 Revision 1.24  2006/07/02 15:58:23  hawk
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-misc-nforce.spec?r1=1.24&r2=1.25&f=u