SPECS: kernel-net-e1000.spec - 7.4.35 - new kernel macros - remove...

[shadzik]

Author: shadzik                      Date: Sat Mar 24 21:11:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 7.4.35
- new kernel macros
- remove obsolete smp support

---- Files affected:
SPECS:
   kernel-net-e1000.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-e1000.spec
diff -u SPECS/kernel-net-e1000.spec:1.63 SPECS/kernel-net-e1000.spec:1.64
--- SPECS/kernel-net-e1000.spec:1.63	Thu Mar  1 02:29:25 2007
+++ SPECS/kernel-net-e1000.spec	Sat Mar 24 22:11:31 2007
@@ -2,28 +2,26 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_rel	1
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
 Name:		kernel%{_alt_kernel}-net-e1000
-Version:	7.4.27
+Version:	7.4.35
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 #Source0:	ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz
 Source0:	http://dl.sourceforge.net/e1000/e1000-%{version}.tar.gz
-# Source0-md5:	1c6f31016bba0cbe2e4dbfecd4c7c058
+# Source0-md5:	cac540f221e3d9589dffc679c490a6a2
 URL:		http://support.intel.com/support/network/adapter/index.htm#PRO/1000
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 Provides:	kernel(e1000)
 Obsoletes:	e1000
@@ -38,28 +36,6 @@
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
-%package -n kernel%{_alt_kernel}-smp-net-e1000
-Summary:	Intel(R) PRO/1000 driver for Linux SMP
-Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-Provides:	kernel(e1000)
-Obsoletes:	e1000
-Obsoletes:	linux-net-e1000
-
-%description -n kernel%{_alt_kernel}-smp-net-e1000
-This package contains the Linux SMP driver for the Intel(R) PRO/1000
-family of 10/100/1000 Ethernet network adapters.
-
-%description -n kernel%{_alt_kernel}-smp-net-e1000 -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
-10/100/1000Mbit z rodziny Intel(R) PRO/1000.
-
 %prep
 %setup -q -n e1000-%{version}
 cat > src/Makefile <<'EOF'
@@ -85,27 +61,11 @@
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-e1000
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-e1000
-%depmod %{_kernel_ver}smp
-
-%if %{with up} || %{without dist_kernel}
 %files
 %defattr(644,root,root,755)
 %doc e1000.7 README ldistrib.txt
 /etc/modprobe.d/%{_kernel_ver}/e1000.conf
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000*.ko*
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-e1000
-%defattr(644,root,root,755)
-%doc e1000.7 README ldistrib.txt
-/etc/modprobe.d/%{_kernel_ver}smp/e1000.conf
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/e1000*.ko*
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,6 +73,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2007/03/24 21:11:31  shadzik
+- 7.4.35
+- new kernel macros
+- remove obsolete smp support
+
 Revision 1.63  2007/03/01 01:29:25  shadzik
 - 7.4.27
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-e1000.spec?r1=1.63&r2=1.64&f=u