SPECS (AC-branch): e1000.spec - obsolete smp package; rel 2

[glen]

Author: glen                         Date: Thu Jul  3 10:31:15 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- obsolete smp package; rel 2

---- Files affected:
SPECS:
   e1000.spec (1.58.2.13 -> 1.58.2.14) 

---- Diffs:

================================================================
Index: SPECS/e1000.spec
diff -u SPECS/e1000.spec:1.58.2.13 SPECS/e1000.spec:1.58.2.14
--- SPECS/e1000.spec:1.58.2.13	Thu Jul  3 12:28:54 2008
+++ SPECS/e1000.spec	Thu Jul  3 12:31:10 2008
@@ -12,11 +12,8 @@
 %if %{without kernel}
 %undefine with_dist_kernel
 %endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine	with_userspace
-%endif
 
-%define		rel	1
+%define		rel		2
 %define		pname	e1000
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
@@ -29,7 +26,7 @@
 # Source0-md5:	744d801c29a3c67713228aea96e17c86
 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
+BuildRequires:	rpmbuild(macros) >= 1.452
 # gcc fails on ac-ppc, ac-sparc has no enable/disable_irq symbols
 ExcludeArch:	ppc sparc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,6 +47,7 @@
 Requires(post,postun):	/sbin/depmod
 %{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Obsoletes:	e1000
+Obsoletes:	kernel%{_alt_kernel}-smp-net-e1000
 Obsoletes:	linux-net-e1000
 
 %description -n kernel%{_alt_kernel}-net-e1000
@@ -104,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58.2.14  2008/07/03 10:31:10  glen
+- obsolete smp package; rel 2
+
 Revision 1.58.2.13  2008/07/03 10:28:54  glen
 - merge 7.6.15.5 from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e1000.spec?r1=1.58.2.13&r2=1.58.2.14&f=u