SPECS: e1000e.spec - merged blacklisting of old module from e1000....

[hawk]

Author: hawk                         Date: Mon May  5 15:42:52 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged blacklisting of old module from e1000.spec

---- Files affected:
SPECS:
   e1000e.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/e1000e.spec
diff -u SPECS/e1000e.spec:1.1 SPECS/e1000e.spec:1.2
--- SPECS/e1000e.spec:1.1	Thu Apr 24 12:04:39 2008
+++ SPECS/e1000e.spec	Mon May  5 17:42:47 2008
@@ -83,7 +83,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m src/%{pname} -d kernel/drivers/net
+%install_kernel_modules -m src/%{pname} -d kernel/drivers/net -n %{pname} -s current
+# blacklist kernel module
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf <<'EOF'
+blacklist e1000e
+alias e1000e e1000e-current
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,6 +102,7 @@
 %files	-n kernel%{_alt_kernel}-net-%{pname}
 %defattr(644,root,root,755)
 %doc e1000e.7 README
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -105,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008-05-05 15:42:47  hawk
+- merged blacklisting of old module from e1000.spec
+
 Revision 1.1  2008-04-24 10:04:39  blues
 - initial, driver is in 2.6.24
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e1000e.spec?r1=1.1&r2=1.2&f=u