X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=febd5965e06b176adb2295b31ccbb399c03b1ca5;hp=94fe871e51a0370992113fcaf44c3e7ba645e5bd;hb=1bb342a9a639008ac8bec0d5eba15af01da7b061;hpb=7c783bb8d620ade92f2db88dbaa98d35d55c33dd

diff --git a/e1000.spec b/e1000.spec
index 94fe871..febd596 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,20 +1,31 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
+%bcond_without	kernel		# don't build kernel modules
 %bcond_with	verbose		# verbose build (V=1)
-#
+
+%ifarch sparc
+%undefine	with_smp
+%endif
+
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+
+%define		rel	7
 %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:		%{pname}%{_alt_kernel}
-Version:	7.6.12
-Release:	%{_rel}
+Version:	8.0.1
+Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5:	e3a54d3a2862b378eeddfa2ce6298cae
+# Source0-md5:	c9464fc1ac8f2c44647262f3a06b0020
 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
@@ -22,41 +33,42 @@ 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.
+adapters with 8254x chipsets.
 
 %description -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
-10/100/1000Mbit z rodziny Intel(R) PRO/1000.
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny
+Intel(R) PRO/1000 opartych o układy 8254x.
 
 %package -n kernel%{_alt_kernel}-net-e1000
-Summary:	Intel(R) PRO/1000 driver for Linux SMP
+Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
-Provides:	kernel(e1000)
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
 
 %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.
+adapters with 8254x chipsets.
 
 %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.
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych z rodziny
+Intel(R) PRO/1000 opartych o układy 8254x.
 
 %prep
 %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
+e1000-objs := e1000_main.o e1000_82540.o e1000_82542.o e1000_82541.o e1000_82543.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
@@ -65,6 +77,11 @@ EOF
 %install
 rm -rf $RPM_BUILD_ROOT
 %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