X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=e5ebed74b53a228c0191d9bdf19bff8d64c3383e;hp=0ad2494b4acee9621da241f79574041af5013f05;hb=16523e0494b8d1067b62d8d6b4a59c0b7cdebb79;hpb=109fa8bada27374eed2e5f6a69b35fe75579b180

diff --git a/e1000.spec b/e1000.spec
index 0ad2494..e5ebed7 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,26 +1,30 @@
-# conditional build
-# _without_dist_kernel          without distribution kernel
-
-%define		_orig_name	e1000
-%define		_rel 1
-
+#
+# 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	1
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Name:		kernel-net-%{_orig_name}
-Version:	4.1.7
+Name:		kernel%{_alt_kernel}-net-e1000
+Version:	7.2.9
 Release:	%{_rel}@%{_kernel_ver_str}
-License:	BSD
-Vendor:		Intel Corporation
+License:	GPL v2
 Group:		Base/Kernel
-Source0:	ftp://aiedownload.intel.com/df-support/2897/eng/%{_orig_name}-%{version}.tar.gz
-%{!?_without_dist_kernel:BuildRequires:         kernel-headers }
-BuildRequires:	%{kgcc_package}
-URL:		http://support.intel.com/support/network/adapter/pro100/
+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
-Provides:	kernel(e1000)
-Prereq:		/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,64 +35,69 @@ 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-smp-net-%{_orig_name}
+%package -n kernel%{_alt_kernel}-smp-net-e1000
 Summary:	Intel(R) PRO/1000 driver for Linux SMP
 Summary(pl):	Sterownik do karty Intel(R) PRO/1000
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Prereq:		/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+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
-Provides:	kernel(e1000)
 
-%description -n kernel-smp-net-%{_orig_name}
+%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-smp-net-%{_orig_name} -l pl
+%description -n kernel%{_alt_kernel}-smp-net-e1000 -l pl
 Ten pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych
 10/100/1000Mbit z rodziny Intel(R) PRO/1000.
 
 %prep
-%setup -q -n %{_orig_name}-%{version}
+%setup -q -n e1000-%{version}
 
 %build
-%{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA" KSRC=/usr/src/linux
-mv -f src/%{_orig_name}.o src/%{_orig_name}-smp.o
-%{__make} -C src clean KSRC=/usr/src/linux
-%{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=/usr/src/linux
+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
+EOF
+
+%build_kernel_modules -m e1000i
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
-install src/%{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.o
-install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.o
 
-gzip -9nf %{_orig_name}.7 README ldistrib.txt
+%install_kernel_modules -m src/e1000i -d kernel/drivers/net
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/depmod -a
+%depmod %{_kernel_ver}
 
 %postun
-/sbin/depmod -a
+%depmod %{_kernel_ver}
 
-%post -n kernel-smp-net-%{_orig_name}
-/sbin/depmod -a
+%post	-n kernel%{_alt_kernel}-smp-net-e1000
+%depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-%{_orig_name}
-/sbin/depmod -a
+%postun -n kernel%{_alt_kernel}-smp-net-e1000
+%depmod %{_kernel_ver}smp
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
-/lib/modules/%{_kernel_ver}/misc/*
+%doc e1000.7 README ldistrib.txt
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/*
 
-%files -n kernel-smp-net-%{_orig_name}
+%if %{with smp} && %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-net-e1000
 %defattr(644,root,root,755)
-%doc *.gz
-/lib/modules/%{_kernel_ver}smp/misc/*
+%doc e1000.7 README ldistrib.txt
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/*
+%endif