X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=76059cdd41644d4f7c390340f5800e33869e89f2;hp=5aa814121ac2454473c585dd83dd62af87b74d79;hb=80546c680008a6bbd531a2790bd910ea8641adaa;hpb=24e604431c21fdeb9c803e067343f09d9e639aa1

diff --git a/e1000.spec b/e1000.spec
index 5aa8141..76059cd 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,92 +1,101 @@
-# conditional build
-# _without_dist_kernel          without distribution kernel
-
-%define		_orig_name	e1000
-
+#
+# 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
 Summary:	Intel(R) PRO/1000 driver for Linux
-Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Name:		kernel-net-%{_orig_name}
-Version:	4.3.15
-%define	_rel	2
+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}
-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
 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-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
+Summary(pl.UTF-8):   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.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 %{_orig_name}-%{version}
+%setup -q -n e1000-%{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
+EOF
 
 %build
-%{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA" KSRC=%{_kernelsrcdir}
-mv -f src/%{_orig_name}.o src/%{_orig_name}-smp.o
-%{__make} -C src clean KSRC=%{_kernelsrcdir}
-%{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
+%build_kernel_modules -C src -m e1000
 
 %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
+%install_kernel_modules -m src/e1000 -d kernel/drivers/net -n e1000 -s current
 
 %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 %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}/misc/*
+%doc e1000.7 README ldistrib.txt
+/etc/modprobe.d/%{_kernel_ver}/e1000.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000*.ko*
 
-%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 %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}smp/misc/*
+%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