- define _mod_name

Changed files:
    e1000.spec -> 1.70

diff --git a/e1000.spec b/e1000.spec
index 4124a800e9693c3d61d459dd6fc7e685f665c66d..c8bea0e1e5f600d8528a5e4eb24d62b44909046f 100644 (file)
--- a/e1000.spec
+++ b/e1000.spec
@@ -4,6 +4,8 @@
 %bcond_with    verbose         # verbose build (V=1)
 #
 %define                _rel    1
 %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
 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


@@ -11,7 +13,7 @@ Version:      7.6.5
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel

-Source0:       http://dl.sourceforge.net/e1000/e1000-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/e1000/%{_mod_name}-%{version}.tar.gz

 # Source0-md5: 99563ec2ae618c1ae6c20d38f6c7ffc3
 URL:           http://sourceforge.net/projects/e1000/
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 # Source0-md5: 99563ec2ae618c1ae6c20d38f6c7ffc3
 URL:           http://sourceforge.net/projects/e1000/
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}


@@ -35,7 +37,7 @@ Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep

-%setup -q -n e1000-%{version}
+%setup -q -n %{_mod_name}-%{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 \
 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 \


@@ -44,11 +46,11 @@ e1000_manage.o e1000_param.o e1000_ethtool.o kcompat.o e1000_api.o
 EOF
 
 %build
 EOF
 
 %build

-%build_kernel_modules -C src -m e1000
+%build_kernel_modules -C src -m %{_mod_name}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-%install_kernel_modules -m src/e1000 -d kernel/drivers/net -n e1000 -s current
+%install_kernel_modules -m src/%{_mod_name} -d kernel/drivers/net -n %{_mod_name} -s current

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -62,5 +64,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc e1000.7 README ldistrib.txt
 %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*
+/etc/modprobe.d/%{_kernel_ver}/%{_mod_name}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{_mod_name}*.ko*