X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=f17386907934267e7883ebed6a4b8eda1675c47c;hp=2d9a135d47f1966a8261574341e404c4c00db271;hb=933ceef2a7083a56c0a33f089720c6c61941bad8;hpb=67ff5f7e4576489d16b2ab74b88fd6a8bd9b9898

diff --git a/e1000.spec b/e1000.spec
index 2d9a135..f173869 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,104 +1,84 @@
 #
 # 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		pname	e1000
 %define		_rel	1
+#
 Summary:	Intel(R) PRO/1000 driver for Linux
-Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Name:		kernel%{_alt_kernel}-net-e1000
-Version:	7.2.9
-Release:	%{_rel}@%{_kernel_ver_str}
+Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
+Name:		%{pname}%{_alt_kernel}
+Version:	7.6.15
+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.308
-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/%{pname}-%{version}.tar.gz
+# Source0-md5:	a5df155b530e7cfd7057771cf542ee4c
+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
+%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}-smp-net-e1000
+%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
+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
+%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
-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}
-
-%build
-cd src
-
-cat >Makefile <<EOF
-obj-m := e1000i.o
-e1000i-objs := e1000_main.o e1000_hw.o e1000_param.o e1000_ethtool.o kcompat.o
+%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 \
+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
+
+EXTRA_CFLAGS=-DDRIVER_E1000
 EOF
 
-%build_kernel_modules -m e1000i
+%build
+%build_kernel_modules -C src -m %{pname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net
-%install_kernel_modules -m src/e1000i -d kernel/drivers/net
+%install_kernel_modules -m src/%{pname} -d kernel/drivers/net -n %{pname} -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
+%files	-n kernel%{_alt_kernel}-net-e1000
 %defattr(644,root,root,755)
-%doc e1000.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/*
-
-%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
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/*
-%endif
+%doc e1000.7 README
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*