X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=68ab4c02f8bfca42aad4d7065068b71af487a349;hp=f17386907934267e7883ebed6a4b8eda1675c47c;hb=cdd86175fa1c5dc9f5895a52ad4fb8535855c8b4;hpb=933ceef2a7083a56c0a33f089720c6c61941bad8

diff --git a/e1000.spec b/e1000.spec
index f173869..68ab4c0 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	1
 %define		pname	e1000
-%define		_rel	1
-#
 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.15
-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:	a5df155b530e7cfd7057771cf542ee4c
+# 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
@@ -29,16 +40,15 @@ 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 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
 
@@ -67,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