SPECS (LINUX_2_6_16): e1000e.spec - cleanups

glen glen at pld-linux.org
Thu Sep 18 15:51:27 CEST 2008


Author: glen                         Date: Thu Sep 18 13:51:27 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- cleanups

---- Files affected:
SPECS:
   e1000e.spec (1.17.2.1 -> 1.17.2.2) 

---- Diffs:

================================================================
Index: SPECS/e1000e.spec
diff -u SPECS/e1000e.spec:1.17.2.1 SPECS/e1000e.spec:1.17.2.2
--- SPECS/e1000e.spec:1.17.2.1	Sat Sep  6 14:40:03 2008
+++ SPECS/e1000e.spec	Thu Sep 18 15:51:21 2008
@@ -6,7 +6,6 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_without	up		# don't build UP module
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
 
 %ifarch sparc
 %undefine	with_smp
@@ -15,9 +14,6 @@
 %if %{without kernel}
 %undefine with_dist_kernel
 %endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
@@ -38,7 +34,6 @@
 BuildRequires:  rpmbuild(macros) >= 1.330
 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. This driver is
@@ -51,7 +46,6 @@
 stworzony aby pracowa. z kartami gigabitowymi rodziny Intel
 82571/2/3/4 PCI-E oraz kontrolerami 82567.
 
-
 %package -n kernel%{_alt_kernel}-net-%{pname}
 Summary:        Intel(R) PRO/1000e driver for Linux
 Summary(pl.UTF-8):      Sterownik do karty Intel(R) PRO/1000e
@@ -62,7 +56,6 @@
 %requires_releq_kernel_up
 Requires(postun):       %releq_kernel_up
 %endif
-Provides:	kernel(e1000e)
 
 %description -n kernel%{_alt_kernel}-net-%{pname}
 This package contains the Linux driver for the Intel(R) PRO/1000
@@ -76,7 +69,6 @@
 stworzony aby pracowa. z kartami gigabitowymi rodziny Intel
 82571/2/3/4 PCI-E oraz kontrolerami 82567.
 
-
 %package -n kernel%{_alt_kernel}-smp-net-%{pname}
 Summary:        Intel(R) PRO/1000e driver for Linux
 Summary(pl.UTF-8):      Sterownik do karty Intel(R) PRO/1000e
@@ -87,7 +79,6 @@
 %requires_releq_kernel_smp
 Requires(postun):       %releq_kernel_smp
 %endif
-Provides:	kernel(e1000e)
 
 %description -n kernel%{_alt_kernel}-smp-net-%{pname}
 This package contains the Linux SMP driver for the Intel(R) PRO/1000
@@ -101,7 +92,6 @@
 stworzony aby pracowa. z kartami gigabitowymi rodziny Intel
 82571/2/3/4 PCI-E oraz kontrolerami 82567.
 
-
 %prep
 %setup -q -n %{pname}-%{version}
 cat > src/Makefile <<'EOF'
@@ -164,9 +154,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17.2.2  2008/09/18 13:51:21  glen
+- cleanups
+
 Revision 1.17.2.1  2008/09/06 12:40:03  marcus
 - LINUX_2_6_16 branch for Ac kernels. Based on e1000.spec.
 
 Revision 1.18  2008/09/06 12:35:27  marcus
 - e1000e driver for 2.6.16.x Ac kernel
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e1000e.spec?r1=1.17.2.1&r2=1.17.2.2&f=u



More information about the pld-cvs-commit mailing list