packages: kernel/kernel.spec, kernel/kernel-bzip2-lzma.config (REMOVED), ke...

[baggins]

Author: baggins                      Date: Mon Jul 11 10:39:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop bzip2-lzma config, we use xz by default
- drop netfilter config and hackery in spec, just use patches.config
  for those few modules we add instead of additional confusing config
  (virtual Provides (netfilter) should probably go away too)

---- Files affected:
packages/kernel:
   kernel.spec (1.932 -> 1.933) , kernel-bzip2-lzma.config (1.1 -> NONE)  (REMOVED), kernel-netfilter.config (1.46 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.932 packages/kernel/kernel.spec:1.933
--- packages/kernel/kernel.spec:1.932	Mon Jul 11 11:47:43 2011
+++ packages/kernel/kernel.spec	Mon Jul 11 12:39:43 2011
@@ -100,7 +100,6 @@
 %define		_enable_debug_packages			0
 
 %define		tuxonice_version	3.2
-%define		netfilter_snap		20070806
 
 %if %{with myown}
 %if "%{_alt_kernel}" == ""
@@ -162,7 +161,6 @@
 Source24:	kernel-powerpc.config
 Source25:	kernel-ia64.config
 
-Source40:	kernel-netfilter.config
 Source41:	kernel-patches.config
 Source42:	kernel-tuxonice.config
 Source43:	kernel-vserver.config
@@ -175,7 +173,6 @@
 Source57:	kernel-wrr.config
 
 Source58:	kernel-inittmpfs.config
-Source59:	kernel-bzip2-lzma.config
 
 # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
 Patch3:		kernel-fbcondecor.patch
@@ -332,7 +329,7 @@
 Requires:	geninitrd >= 10000-3
 Requires:	module-init-tools >= 0.9.9
 Suggests:	keyutils
-Provides:	%{name}(netfilter) = %{netfilter_snap}
+Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
 Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:	kernel-firmware
@@ -435,7 +432,7 @@
 %endif
 %define MakeOpts %{CrossOpts} HOSTCC="%{__cc}"
 
-%define __features Netfilter module dated: %{netfilter_snap}\
+%define __features \
 %{?with_grsecurity:Grsecurity support - enabled}\
 %{?with_pax:PaX support - enabled}\
 %{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
@@ -572,7 +569,7 @@
 Summary(de.UTF-8):	Header Dateien für den Linux-Kernel
 Summary(pl.UTF-8):	Pliki nagłówkowe jądra Linuksa
 Group:		Development/Building
-Provides:	%{name}-headers(netfilter) = %{netfilter_snap}
+Provides:	%{name}-headers(netfilter) = 20070806
 AutoReqProv:	no
 
 %description headers
@@ -987,7 +984,6 @@
 %if %{without vanilla}
 %if %{with rescuecd}
 		%{SOURCE58} \
-		%{SOURCE59} \
 		rescue.config \
 %endif
 		\
@@ -1021,7 +1017,6 @@
 %endif
 		%{SOURCE41} %{?0:patches} \
 %endif
-		%{SOURCE40} %{?0:netfilter} \
 		%{SOURCE20} \
 		$RPM_SOURCE_DIR/$Config
 }
@@ -1535,6 +1530,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.933  2011/07/11 10:39:43  baggins
+- drop bzip2-lzma config, we use xz by default
+- drop netfilter config and hackery in spec, just use patches.config
+  for those few modules we add instead of additional confusing config
+  (virtual Provides (netfilter) should probably go away too)
+
 Revision 1.932  2011/07/11 09:47:43  baggins
 - removed obsolete xfs-delaylog patch
 - updated patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.932&r2=1.933&f=u