From: Jakub Bogusz Date: Thu, 21 Oct 2004 19:09:11 +0000 (+0000) Subject: - 2.6 now - updated deps; fixed bconds X-Git-Tag: auto/ac/kernel-net-e1000-6_2_15-1~15 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=commitdiff_plain;h=c259e07767f69000092395f37ae7de469340cf64 - 2.6 now - updated deps; fixed bconds Changed files: e1000.spec -> 1.27 --- diff --git a/e1000.spec b/e1000.spec index 478e15c..093c280 100644 --- a/e1000.spec +++ b/e1000.spec @@ -1,14 +1,10 @@ # # Conditional build: -# _without_dist_kernel without distribution kernel +%bcond_without dist_kernel # without distribution kernel +%bcond_without smp # don't build SMP module # -%bcond_without dist_kernel -%bcond_without smp - %define _orig_name e1000 - -%{!?_without_dist_kernel:%define _mod_name %{_orig_name}_intel } -%{?_without_dist_kernel:%define _mod_name %{_orig_name} } +%define _mod_name e1000%{?with_dist_kernel:_intel} Summary: Intel(R) PRO/1000 driver for Linux Summary(pl): Sterownik do karty Intel(R) PRO/1000 @@ -21,11 +17,11 @@ Vendor: Intel Corporation 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 } +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.0} BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.118 URL: http://support.intel.com/support/network/adapter/pro100/ -%{!?_without_dist_kernel:%requires_releq_kernel_up} +%{?with_dist_kernel:%requires_releq_kernel_up} Requires(post,postun): /sbin/depmod Provides: kernel(e1000) Obsoletes: e1000 @@ -45,7 +41,7 @@ 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} +%{?with_dist_kernel:%requires_releq_kernel_smp} Requires(post,postun): /sbin/depmod Provides: kernel(e1000) Obsoletes: e1000