- blacklist old e1000 module from kernel source

[packages/e1000.git] / e1000.spec

diff --git a/e1000.spec b/e1000.spec
index c8bea0e1e5f600d8528a5e4eb24d62b44909046f..9b9646de647df442f605ccd7a529d735e27d1c74 100644 (file)
--- a/e1000.spec
+++ b/e1000.spec
@@ -3,21 +3,36 @@
 %bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_with    verbose         # verbose build (V=1)
 #
-%define                _rel    1
-%define                _mod_name       e1000
+%define                pname   e1000
+%define                rel     2
 #
 Summary:       Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) PRO/1000
-Name:          kernel%{_alt_kernel}-net-e1000
-Version:       7.6.5
-Release:       %{_rel}@%{_kernel_ver_str}
+Name:          %{pname}%{_alt_kernel}
+Version:       7.6.15.4
+Release:       %{rel}
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://dl.sourceforge.net/e1000/%{_mod_name}-%{version}.tar.gz
-# Source0-md5: 99563ec2ae618c1ae6c20d38f6c7ffc3
+Source0:       http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
+# Source0-md5: a35a6dfdf1e9395b6c2375fedb7ee67d
 URL:           http://sourceforge.net/projects/e1000/
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.379
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This package contains the Linux driver for the Intel(R) PRO/1000
+family of 10/100/1000 Ethernet network adapters.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
+10/100/1000Mbit z rodziny Intel(R) PRO/1000.
+
+%package -n kernel%{_alt_kernel}-net-e1000
+Summary:       Intel(R) PRO/1000 driver for Linux
+Summary(pl.UTF-8):     Sterownik do karty Intel(R) PRO/1000
+Release:       %{rel}@%{_kernel_ver_str}
+Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel
@@ -26,43 +41,49 @@ Requires(postun):   %releq_kernel
 Provides:      kernel(e1000)
 Obsoletes:     e1000
 Obsoletes:     linux-net-e1000
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
+%description -n kernel%{_alt_kernel}-net-e1000
 This package contains the Linux driver for the Intel(R) PRO/1000
 family of 10/100/1000 Ethernet network adapters.
 
-%description -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-net-e1000 -l pl.UTF-8
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep
-%setup -q -n %{_mod_name}-%{version}
+%setup -q -n %{pname}-%{version}
 cat > src/Makefile <<'EOF'
 obj-m := e1000.o
 e1000-objs := e1000_main.o e1000_82540.o e1000_82542.o e1000_82571.o e1000_82541.o \
 e1000_82543.o e1000_ich8lan.o e1000_80003es2lan.o e1000_mac.o e1000_nvm.o e1000_phy.o \
 e1000_manage.o e1000_param.o e1000_ethtool.o kcompat.o e1000_api.o
+
+EXTRA_CFLAGS=-DDRIVER_E1000
 EOF
 
 %build
-%build_kernel_modules -C src -m %{_mod_name}
+%build_kernel_modules -C src -m %{pname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m src/%{_mod_name} -d kernel/drivers/net -n %{_mod_name} -s current
+%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 e1000
+alias e1000 e1000-current
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post  -n kernel%{_alt_kernel}-net-e1000
 %depmod %{_kernel_ver}
 
-%postun
+%postun        -n kernel%{_alt_kernel}-net-e1000
 %depmod %{_kernel_ver}
 
-%files
+%files -n kernel%{_alt_kernel}-net-e1000
 %defattr(644,root,root,755)
-%doc e1000.7 README ldistrib.txt
-/etc/modprobe.d/%{_kernel_ver}/%{_mod_name}.conf
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{_mod_name}*.ko*
+%doc e1000.7 README
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*