- keep src.rpm without kernel ver (update from AC-branch), cvs cp pending

[packages/e1000.git] / e1000.spec

diff --git a/e1000.spec b/e1000.spec
index e008462a1cbdc39ba3a44965ab027b628a67546d..7a5ced3f4f8968a90bbaab08dbdf6d20b9dff79c 100644 (file)
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,30 +1,22 @@
 #
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
-%bcond_without smp             # don't build SMP module
 %bcond_with    verbose         # verbose build (V=1)
 #
-%define                _rel    2
+%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.2.9
-Release:       %{_rel}@%{_kernel_ver_str}
+Name:          e1000
+Version:       7.6.12
+Release:       %{_rel}
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz
-# Source0-md5: cb9f601df6c60f889aaabec475ba2089
-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
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):      %releq_kernel_up
-%endif
-Provides:      kernel(e1000)
-Obsoletes:     e1000
-Obsoletes:     linux-net-e1000
+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
@@ -35,67 +27,55 @@ family of 10/100/1000 Ethernet network adapters.
 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
+%package -n kernel%{_alt_kernel}-net-e1000
 Summary:       Intel(R) PRO/1000 driver for Linux SMP
-Summary(pl.UTF-8):     Sterownik do karty Intel(R) PRO/1000
+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_smp
-Requires(postun):      %releq_kernel_smp
+%requires_releq_kernel
+Requires(postun):      %releq_kernel
 %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
+%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 -n kernel%{_alt_kernel}-smp-net-e1000 -l pl.UTF-8
-Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
+%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 e1000-%{version}
+%setup -q
 cat > src/Makefile <<'EOF'
 obj-m := e1000.o
-e1000-objs := e1000_main.o e1000_hw.o e1000_param.o e1000_ethtool.o kcompat.o
+e1000-objs := e1000_main.o e1000_82540.o e1000_82542.o e1000_82571.o e1000_82541.o \
+e1000_82543.o e1000_ich8lan.o e1000_80003es2lan.o e1000_mac.o e1000_nvm.o e1000_phy.o \
+e1000_manage.o e1000_param.o e1000_ethtool.o kcompat.o e1000_api.o
 EOF
 
 %build
-%build_kernel_modules -C src -m e1000
+%build_kernel_modules -C src -m %{name}
 
 %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/%{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}
 
-%post  -n kernel%{_alt_kernel}-smp-net-e1000
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-e1000
-%depmod %{_kernel_ver}smp
-
-%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*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-e1000
+%files -n kernel%{_alt_kernel}-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
+%doc e1000.7 README
+/etc/modprobe.d/%{_kernel_ver}/%{name}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{name}*.ko*