From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 4 Apr 2008 18:56:40 +0000 (+0000)
Subject: - merge fixes from AC-branch
X-Git-Tag: auto/th/e1000-7_6_15_5-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=commitdiff_plain;h=1c8cc1882c6f380f5445af9931c0c6f4e2daf2c2;hp=2342ac03c4af9844520c42b1935fcf0394e01f8d

- merge fixes from AC-branch

Changed files:
    e1000.spec -> 1.85
---

diff --git a/e1000.spec b/e1000.spec
index e5eb38e..029deed 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,11 +1,22 @@
 #
 # 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)
-#
-%define		pname	e1000
+
+%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
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
 Name:		%{pname}%{_alt_kernel}
@@ -38,7 +49,6 @@ Requires(post,postun):	/sbin/depmod
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
-Provides:	kernel(e1000)
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000