X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=blobdiff_plain;f=e1000.spec;h=6312475d2fcf01f9ae323070ba305e2ab1a87fce;hp=7c6d6aa427938529435d9e984bb3ede95e3f0069;hb=a757dfe2710c48535bfa41cf28ba1626fb22b679;hpb=b80cbcef8a1ec7ff5e3caaa5ab168453971e9cb0

diff --git a/e1000.spec b/e1000.spec
index 7c6d6aa..6312475 100644
--- a/e1000.spec
+++ b/e1000.spec
@@ -1,29 +1,26 @@
 #
 # Conditional build:
-# _without_dist_kernel          without distribution kernel
+%bcond_without	dist_kernel	# allow non-distribution kernel
+%bcond_with	verbose		# verbose build (V=1)
 #
-%define		_orig_name	e1000
-
-%{!?_without_dist_kernel:%define	_mod_name %{_orig_name}_intel }
-%{?_without_dist_kernel:%define		_mod_name %{_orig_name} }
-
+%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:	5.5.4
-%define	_rel	1
+Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
+Name:		kernel%{_alt_kernel}-net-e1000
+Version:	7.5.5
 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
-# Source0-md5:	f6e55d5f3a112dca04397e62d720ef84
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers >= 2.4.20 }
-BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.118
-URL:		http://support.intel.com/support/network/adapter/pro100/
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+Source0:	http://dl.sourceforge.net/e1000/e1000-%{version}.tar.gz
+# Source0-md5:	c2e39cfd4aaf4a297a06e5ad795761e7
+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
+Requires(postun):	%releq_kernel
+%endif
 Provides:	kernel(e1000)
 Obsoletes:	e1000
 Obsoletes:	linux-net-e1000
@@ -33,58 +30,25 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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}
-Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Provides:	kernel(e1000)
-Obsoletes:	e1000
-Obsoletes:	linux-net-e1000
-
-%description -n kernel-smp-net-%{_orig_name}
-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
-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_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
-%ifarch %{ix86}
-%{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
-%ifarch ppc
-%{__make} -C src SMP=1 CC="%{kgcc} -msoft-float  -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
-%ifnarch %{ix86} ppc
-%{__make} -C src SMP=1 CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
-mv -f src/%{_orig_name}.o src/%{_orig_name}-smp.o
-
-%{__make} -C src clean KSRC=%{_kernelsrcdir}
-
-%ifarch ppc
-%{__make} -C src CC="%{kgcc} -msoft-float -DSTB_WA" KSRC=%{_kernelsrcdir}
-%else
-%{__make} -C src CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
-%endif
+%build_kernel_modules -C src -m e1000
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc
-install src/%{_orig_name}-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc/%{_mod_name}.o
-install src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc/%{_mod_name}.o
+%install_kernel_modules -m src/e1000 -d kernel/drivers/net -n e1000 -s current
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,18 +59,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-net-%{_orig_name}
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel-smp-net-%{_orig_name}
-%depmod %{_kernel_ver}smp
-
 %files
 %defattr(644,root,root,755)
-%doc %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/misc/*
-
-%files -n kernel-smp-net-%{_orig_name}
-%defattr(644,root,root,755)
-%doc %{_orig_name}.7 README ldistrib.txt
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/misc/*
+%doc e1000.7 README ldistrib.txt
+/etc/modprobe.d/%{_kernel_ver}/e1000.conf
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000*.ko*