X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=af7534ed2e24cf4c60ec8b0da58e0a4a1a546791;hp=f939f052a65afde8866a1d515cf77bc8fc0bca08;hb=7b07a70c3e8e0b983c4c2badc5000db36c127ac6;hpb=6f06dc414f55cb1fb64e489fdf0d4f879f8b560d

diff --git a/e1000.spec b/e1000.spec
index f939f05..af7534e 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,27 +1,27 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		_rel	2
+%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
-Version:	7.2.9
+Version:	7.6.12
 Release:	%{_rel}@%{_kernel_ver_str}
 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
+Source0:	http://dl.sourceforge.net/e1000/%{_mod_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
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 Provides:	kernel(e1000)
 Obsoletes:	e1000
@@ -36,41 +36,21 @@ 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
-Summary:	Intel(R) PRO/1000 driver for Linux SMP
-Summary(pl.UTF-8):	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
-%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
-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
-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_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 %{_mod_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/%{_mod_name} -d kernel/drivers/net -n %{_mod_name} -s current
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,24 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %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
-
-%if %{with up} || %{without dist_kernel}
 %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*
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-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}/%{_mod_name}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{_mod_name}*.ko*