From 969a8b5b077737baefb529b605299d50dc610fd4 Mon Sep 17 00:00:00 2001 From: shadzik Date: Sat, 24 Mar 2007 21:11:31 +0000 Subject: [PATCH] - 7.4.35 - new kernel macros - remove obsolete smp support Changed files: e1000.spec -> 1.64 --- e1000.spec | 50 +++++--------------------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/e1000.spec b/e1000.spec index 17ba043..b49c49b 100644 --- a/e1000.spec +++ b/e1000.spec @@ -1,28 +1,26 @@ # # Conditional build: %bcond_without dist_kernel # allow non-distribution kernel -%bcond_without up # don't build UP module -%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.UTF-8): Sterownik do karty Intel(R) PRO/1000 Name: kernel%{_alt_kernel}-net-e1000 -Version: 7.4.27 +Version: 7.4.35 Release: %{_rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel #Source0: ftp://aiedownload.intel.com/df-support/9180/eng/e1000-%{version}.tar.gz Source0: http://dl.sourceforge.net/e1000/e1000-%{version}.tar.gz -# Source0-md5: 1c6f31016bba0cbe2e4dbfecd4c7c058 +# Source0-md5: cac540f221e3d9589dffc679c490a6a2 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 +BuildRequires: rpmbuild(macros) >= 1.379 Requires(post,postun): /sbin/depmod %if %{with dist_kernel} -%requires_releq_kernel_up -Requires(postun): %releq_kernel_up +%requires_releq_kernel +Requires(postun): %releq_kernel %endif Provides: kernel(e1000) Obsoletes: e1000 @@ -37,28 +35,6 @@ 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%{_alt_kernel}-smp-net-e1000 -Summary: Intel(R) PRO/1000 driver for Linux SMP -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 -%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 -family of 10/100/1000 Ethernet network adapters. - -%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 e1000-%{version} cat > src/Makefile <<'EOF' @@ -84,24 +60,8 @@ rm -rf $RPM_BUILD_ROOT %postun %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 - -%if %{with up} || %{without dist_kernel} %files %defattr(644,root,root,755) %doc e1000.7 README ldistrib.txt /etc/modprobe.d/%{_kernel_ver}/e1000.conf /lib/modules/%{_kernel_ver}/kernel/drivers/net/e1000*.ko* -%endif - -%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 -/etc/modprobe.d/%{_kernel_ver}smp/e1000.conf -/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/e1000*.ko* -%endif -- 2.43.0