SPECS: e1000.spec - suffix src package with alt kernel name (if pr...

[hawk]

Author: hawk                         Date: Wed Jan 23 17:32:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- suffix src package with alt kernel name (if present)

---- Files affected:
SPECS:
   e1000.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/e1000.spec
diff -u SPECS/e1000.spec:1.75 SPECS/e1000.spec:1.76
--- SPECS/e1000.spec:1.75	Tue Dec 18 00:43:57 2007
+++ SPECS/e1000.spec	Wed Jan 23 18:32:04 2008
@@ -4,16 +4,17 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_with	verbose		# verbose build (V=1)
 #
+%define		pname	e1000
 %define		_rel	2
 #
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
-Name:		e1000
+Name:		%{pname}%{_alt_kernel}
 Version:	7.6.12
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/e1000/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{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}
@@ -51,7 +52,7 @@
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 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 \
@@ -60,11 +61,11 @@
 EOF
 
 %build
-%build_kernel_modules -C src -m %{name}
+%build_kernel_modules -C src -m %{pname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m src/%{name} -d kernel/drivers/net -n %{name} -s current
+%install_kernel_modules -m src/%{pname} -d kernel/drivers/net -n %{pname} -s current
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,8 +79,8 @@
 %files	-n kernel%{_alt_kernel}-net-e1000
 %defattr(644,root,root,755)
 %doc e1000.7 README
-/etc/modprobe.d/%{_kernel_ver}/%{name}.conf
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{name}*.ko*
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -87,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2008-01-23 17:32:04  hawk
+- suffix src package with alt kernel name (if present)
+
 Revision 1.75  2007-12-17 23:43:57  shadzik
 - summary ut8
 
================================================================

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