Author: glen Date: Fri Apr 4 18:56:46 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge fixes from AC-branch
---- Files affected:
SPECS:
e1000.spec (1.84 -> 1.85)
---- Diffs:
================================================================
Index: SPECS/e1000.spec
diff -u SPECS/e1000.spec:1.84 SPECS/e1000.spec:1.85
--- SPECS/e1000.spec:1.84 Fri Mar 28 09:14:12 2008
+++ SPECS/e1000.spec Fri Apr 4 20:56:40 2008
@@ -2,11 +2,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}
@@ -39,7 +50,6 @@
%requires_releq_kernel
Requires(postun): %releq_kernel
%endif
-Provides: kernel(e1000)
Obsoletes: e1000
Obsoletes: linux-net-e1000
@@ -95,6 +105,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.85 2008-04-04 18:56:40 glen
+- merge fixes from AC-branch
+
Revision 1.84 2008-03-28 08:14:12 hawk
- updated to 7.6.15.5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e1000.spec?r1=1.84&r2=1.85&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
