- merge fixes from AC-branch

Changed files:
    e1000.spec -> 1.85

diff --git a/e1000.spec b/e1000.spec
index e5eb38e9afb12377bcd1ba4af59388578ebd8fb0..029deed4dde582ccc31b1a12143f5b6cf56c752b 100644 (file)
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,11 +1,22 @@
 #
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
 #
 # 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)
 %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                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}
 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
 %requires_releq_kernel
 Requires(postun):      %releq_kernel
 %endif

-Provides:      kernel(e1000)

 Obsoletes:     e1000
 Obsoletes:     linux-net-e1000
 
 Obsoletes:     e1000
 Obsoletes:     linux-net-e1000