X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=9b9646de647df442f605ccd7a529d735e27d1c74;hp=96efcc02a66ce22530fb972f296b910ca0f2d413;hb=5711d242b7a4c67ee60bb49cfef1326332f18a68;hpb=0b8188e685b01a51af73b7f14d2bee89035ec7f1

diff --git a/e1000.spec b/e1000.spec
index 96efcc0..9b9646d 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,94 +1,89 @@
-# 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_with	verbose		# verbose build (V=1)
+#
+%define		pname	e1000
+%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.1.7
-Release:	%{_rel}@%{_kernel_ver_str}
-License:	BSD
-Vendor:		Intel Corporation
+Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
+Name:		%{pname}%{_alt_kernel}
+Version:	7.6.15.4
+Release:	%{rel}
+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/
-Obsoletes:	e1000
-Obsoletes:	linux-net-e1000
-Provides:	kernel(e1000)
-Prereq:		/sbin/depmod
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+Source0:	http://dl.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
+# Source0-md5:	a35a6dfdf1e9395b6c2375fedb7ee67d
+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-smp-net-%{_orig_name}
-Summary:	Intel(R) PRO/1000 driver for Linux SMP
-Summary(pl):	Sterownik do karty Intel(R) PRO/1000
-Release:	%{_rel}@%{_kernel_ver_str}
+%package -n kernel%{_alt_kernel}-net-e1000
+Summary:	Intel(R) PRO/1000 driver for Linux
+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
+Requires(postun):	%releq_kernel
+%endif
+Provides:	kernel(e1000)
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
-Provides:	kernel(e1000)
 
-%description -n kernel-smp-net-%{_orig_name}
-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-smp-net-%{_orig_name} -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 %{_orig_name}-%{version}
+%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
-%{__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
-%{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=/usr/src/linux
+%build_kernel_modules -C src -m %{pname}
 
 %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/%{pname} -d kernel/drivers/net -n %{pname} -s current
+# blacklist kernel module
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf <<'EOF'
+blacklist e1000
+alias e1000 e1000-current
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/depmod -a
+%post	-n kernel%{_alt_kernel}-net-e1000
+%depmod %{_kernel_ver}
 
-%postun
-/sbin/depmod -a
-
-%post -n kernel-smp-net-%{_orig_name}
-/sbin/depmod -a
-
-%postun -n kernel-smp-net-%{_orig_name}
-/sbin/depmod -a
-
-%files
-%defattr(644,root,root,755)
-%doc *.gz
-/lib/modules/%{_kernel_ver}/misc/*
+%postun	-n kernel%{_alt_kernel}-net-e1000
+%depmod %{_kernel_ver}
 
-%files -n kernel-smp-net-%{_orig_name}
+%files	-n kernel%{_alt_kernel}-net-e1000
 %defattr(644,root,root,755)
-%doc *.gz
-/lib/modules/%{_kernel_ver}smp/misc/*
+%doc e1000.7 README
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*