From df193a653c3dd35a37bde3586d08c7e7b0387196 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 27 Nov 2007 23:00:40 +0000
Subject: [PATCH] - keep src.rpm without kernel ver (update from AC-branch),
 cvs cp pending

Changed files:
    e1000.spec -> 1.73
---
 e1000.spec | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/e1000.spec b/e1000.spec
index af7534e..7a5ced3 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -4,20 +4,34 @@
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_rel	1
-%define		_mod_name	e1000
 #
 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
+Name:		e1000
 Version:	7.6.12
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/e1000/%{_mod_name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/e1000/%{name}-%{version}.tar.gz
 # Source0-md5:	e3a54d3a2862b378eeddfa2ce6298cae
 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
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This package contains the Linux driver for the Intel(R) PRO/1000
+family of 10/100/1000 Ethernet network adapters.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
+10/100/1000Mbit z rodziny Intel(R) PRO/1000.
+
+%package -n kernel%{_alt_kernel}-net-e1000
+Summary:	Intel(R) PRO/1000 driver for Linux SMP
+Summary(pl):	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
@@ -26,18 +40,17 @@ Requires(postun):	%releq_kernel
 Provides:	kernel(e1000)
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
+%description -n kernel%{_alt_kernel}-net-e1000
 This package contains the Linux driver for the Intel(R) PRO/1000
 family of 10/100/1000 Ethernet network adapters.
 
-%description -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-net-e1000 -l pl.UTF-8
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep
-%setup -q -n %{_mod_name}-%{version}
+%setup -q
 cat > src/Makefile <<'EOF'
 obj-m := e1000.o
 e1000-objs := e1000_main.o e1000_82540.o e1000_82542.o e1000_82571.o e1000_82541.o \
@@ -46,23 +59,23 @@ e1000_manage.o e1000_param.o e1000_ethtool.o kcompat.o e1000_api.o
 EOF
 
 %build
-%build_kernel_modules -C src -m %{_mod_name}
+%build_kernel_modules -C src -m %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m src/%{_mod_name} -d kernel/drivers/net -n %{_mod_name} -s current
+%install_kernel_modules -m src/%{name} -d kernel/drivers/net -n %{name} -s current
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post	-n kernel%{_alt_kernel}-net-e1000
 %depmod %{_kernel_ver}
 
-%postun
+%postun	-n kernel%{_alt_kernel}-net-e1000
 %depmod %{_kernel_ver}
 
-%files
+%files	-n kernel%{_alt_kernel}-net-e1000
 %defattr(644,root,root,755)
-%doc e1000.7 README 
-/etc/modprobe.d/%{_kernel_ver}/%{_mod_name}.conf
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{_mod_name}*.ko*
+%doc e1000.7 README
+/etc/modprobe.d/%{_kernel_ver}/%{name}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{name}*.ko*
-- 
2.43.0