SPECS: kernel-net-e1000.spec - keep src.rpm without kernel ver (up...

[glen]

Author: glen                         Date: Tue Nov 27 23:00:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- keep src.rpm without kernel ver (update from AC-branch), cvs cp pending

---- Files affected:
SPECS:
   kernel-net-e1000.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-e1000.spec
diff -u SPECS/kernel-net-e1000.spec:1.72 SPECS/kernel-net-e1000.spec:1.73
--- SPECS/kernel-net-e1000.spec:1.72	Tue Nov 27 02:18:18 2007
+++ SPECS/kernel-net-e1000.spec	Wed Nov 28 00:00:40 2007
@@ -5,20 +5,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
@@ -27,18 +41,17 @@
 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 \
@@ -47,26 +60,26 @@
 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*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -74,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2007-11-27 23:00:40  glen
+- keep src.rpm without kernel ver (update from AC-branch), cvs cp pending
+
 Revision 1.72  2007-11-27 01:18:18  shadzik
 - 7.6.12
 
================================================================

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