SPECS: kernel-net-e1000.spec - add per package modprobe file so on...

[glen]

Author: glen                         Date: Tue Nov 28 17:59:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add per package modprobe file so one could keep using e1000 in their modprobe.conf

---- Files affected:
SPECS:
   kernel-net-e1000.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-e1000.spec
diff -u SPECS/kernel-net-e1000.spec:1.57 SPECS/kernel-net-e1000.spec:1.58
--- SPECS/kernel-net-e1000.spec:1.57	Sun Nov 19 22:21:59 2006
+++ SPECS/kernel-net-e1000.spec	Tue Nov 28 18:59:24 2006
@@ -5,7 +5,7 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel	1
+%define		_rel	2
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
 Name:		kernel%{_alt_kernel}-net-e1000
@@ -61,17 +61,16 @@
 %prep
 %setup -q -n e1000-%{version}
 cat > src/Makefile <<'EOF'
-obj-m := e1000i.o
-e1000i-objs := e1000_main.o e1000_hw.o e1000_param.o e1000_ethtool.o kcompat.o
+obj-m := e1000.o
+e1000-objs := e1000_main.o e1000_hw.o e1000_param.o e1000_ethtool.o kcompat.o
 EOF
 
 %build
-%build_kernel_modules -C src -m e1000i
+%build_kernel_modules -C src -m e1000
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%install_kernel_modules -m src/e1000i -d kernel/drivers/net
+%install_kernel_modules -m src/e1000 -d kernel/drivers/net -n e1000 -s current
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,13 +90,15 @@
 %files
 %defattr(644,root,root,755)
 %doc e1000.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000i.ko*
+/etc/modprobe.d/%{_kernel_ver}/e1000.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000*.ko*
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-e1000
 %defattr(644,root,root,755)
 %doc e1000.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/e1000i.ko*
+/etc/modprobe.d/%{_kernel_ver}smp/e1000.conf
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/e1000*.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -106,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2006/11/28 17:59:24  glen
+- add per package modprobe file so one could keep using e1000 in their modprobe.conf
+
 Revision 1.57  2006/11/19 21:21:59  sparky
 - cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-e1000.spec?r1=1.57&r2=1.58&f=u