- no userspace in this spec

[packages/e1000e.git] / e1000e.spec

diff --git a/e1000e.spec b/e1000e.spec
index 0ff443c7f99731abaad02901281e8dcc8c3b64b4..a8010bb9d7fb24257f7216139278ee3b001470fd 100644 (file)
--- a/e1000e.spec
+++ b/e1000e.spec
@@ -1,24 +1,12 @@
-# Module for kernels <2.6.24
 #
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
-%bcond_without kernel          # don't build kernel modules
-%bcond_without userspace       # don't build userspace programs
 %bcond_with    verbose         # verbose build (V=1)
 
 %if %{without kernel}
 %undefine with_dist_kernel
 %endif
 
-# The goal here is to have main, userspace, package built once with
-# simple release number, and only rebuild kernel packages with kernel
-# version as part of release number, without the need to bump release
-# with every kernel change.
-%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
-%{error:kernel and userspace cannot be built at the same time on PLD builders}
-exit 1
-%endif
-
 %if "%{_alt_kernel}" != "%{nil}"
 %if 0%{?build_kernels:1}
 %{error:alt_kernel and build_kernels are mutually exclusive}
@@ -33,14 +21,13 @@ exit 1
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 %define                ikpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
 
-%define                rel     19
+%define                rel     20
 %define                pname   e1000e
 Summary:       Intel(R) PRO/1000e driver for Linux
-Summary(en.UTF-8):     Intel® PRO/1000e driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel® PRO/1000e
 Name:          %{pname}%{_alt_kernel}
 Version:       2.4.14
-Release:       %{rel}%{?with_kernel:@%{_kernel_ver_str}}
+Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
@@ -56,12 +43,6 @@ family of 10/100/1000 Ethernet network adapters. This driver is
 designed to work with the Intel(R) 82571/2/3/4 PCI-E family of gigabit
 adapters and 82567 controllers.
 
-%description -l en.UTF-8
-This package contains the Linux driver for the Intel® PRO/1000 family
-of 10/100/1000 Ethernet network adapters. This driver is designed to
-work with the Intel® 82571/2/3/4 PCI-E family of gigabit adapters and
-82567 controllers.
-
 %description -l pl.UTF-8
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych
 10/100/1000Mbit z rodziny Intel® PRO/1000. Ten sterownik jest
@@ -71,7 +52,6 @@ stworzony aby pracować z kartami gigabitowymi rodziny Intel®
 %define        kernel_pkg()\
 %package -n kernel%{_alt_kernel}-net-%{pname}\
 Summary:       Intel(R) PRO/1000e driver for Linux %{_kernelsrcdir}:%{__kernel_rpmvr}\
-Summary(en.UTF-8):     Intel® PRO/1000e driver for Linux\
 Summary(pl.UTF-8):     Sterownik do karty Intel® PRO/1000e\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
@@ -87,25 +67,17 @@ family of 10/100/1000 Ethernet network adapters. This driver is\
 designed to work with the Intel(R) 82571/2/3/4 PCI-E family of gigabit\
 adapters and 82567 controllers.\
 \
-%description -n kernel%{_alt_kernel}-net-%{pname} -l en.UTF-8\
-This package contains the Linux driver for the Intel® PRO/1000 family\
-of 10/100/1000 Ethernet network adapters. This driver is designed to\
-work with the Intel® 82571/2/3/4 PCI-E family of gigabit adapters and\
-82567 controllers.\
-\
 %description -n kernel%{_alt_kernel}-net-%{pname} -l pl.UTF-8\
 Ten pakiet zawiera sterownik dla Linuksa do kart sieciowych\
 10/100/1000Mbit z rodziny Intel® PRO/1000. Ten sterownik jest\
 stworzony aby pracować z kartami gigabitowymi rodziny Intel®\
 82571/2/3/4 PCI-E oraz kontrolerami 82567.\
 \
-%if %{with kernel}\
 %files -n kernel%{_alt_kernel}-net-%{pname}\
 %defattr(755,root,root,755)\
 %doc e1000e.7 README\
 /etc/modprobe.d/%{_kernel_ver}/%{pname}.conf\
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*\
-%endif\
 \
 %post  -n kernel%{_alt_kernel}-net-%{pname}\
 %depmod %{_kernel_ver}\
@@ -128,7 +100,7 @@ alias e1000e e1000e-current\
 EOF\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{expand:%kpkg}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -144,16 +116,14 @@ EOF
 # add -DE1000E_NO_NAPI to disable NAPI
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{expand:%bkpkg}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT
 
-%if %{with kernel}
 %{expand:%ikpkg}
 cp -a installed/* $RPM_BUILD_ROOT
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT