SPECS: kernel-desktop.spec - netfilter throwed

[sparky]

Author: sparky                       Date: Mon May  1 23:09:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- netfilter throwed

---- Files affected:
SPECS:
   kernel-desktop.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.5 SPECS/kernel-desktop.spec:1.6
--- SPECS/kernel-desktop.spec:1.5	Tue May  2 00:36:14 2006
+++ SPECS/kernel-desktop.spec	Tue May  2 01:09:33 2006
@@ -97,7 +97,7 @@
 Source43:	kernel-suspend2.config
 Source44:	kernel-vesafb-tng.config
 Source45:	kernel-squashfs.config
-Source46:	kernel-netfilter.config
+Source46:	kernel-desktop-nonetfilter.config
 Source47:	kernel-grsec.config
 
 ###
@@ -122,32 +122,6 @@
 Patch8:		linux-fbcon-margins.patch
 Patch9:		linux-static-dev.patch
 
-########	netfilter snap
-## base
-Patch10:	pom-ng-IPV4OPTSSTRIP-%{_netfilter_snap}.patch
-Patch11:	pom-ng-connlimit-%{_netfilter_snap}.patch
-Patch12:	pom-ng-expire-%{_netfilter_snap}.patch
-Patch13:	pom-ng-fuzzy-%{_netfilter_snap}.patch
-Patch14:	pom-ng-ipv4options-%{_netfilter_snap}.patch
-Patch15:	pom-ng-nth-%{_netfilter_snap}.patch
-Patch16:	pom-ng-osf-%{_netfilter_snap}.patch
-Patch17:	pom-ng-psd-%{_netfilter_snap}.patch
-Patch18:	pom-ng-quota-%{_netfilter_snap}.patch
-Patch19:	pom-ng-random-%{_netfilter_snap}.patch
-Patch20:	pom-ng-set-%{_netfilter_snap}.patch
-Patch21:	pom-ng-time-%{_netfilter_snap}.patch
-Patch22:	pom-ng-u32-%{_netfilter_snap}.patch
-
-## extra
-Patch30:	pom-ng-ACCOUNT-%{_netfilter_snap}.patch
-Patch31:	pom-ng-IPMARK-%{_netfilter_snap}.patch
-Patch32:	pom-ng-ROUTE-%{_netfilter_snap}.patch
-Patch33:	pom-ng-TARPIT-%{_netfilter_snap}.patch
-Patch34:	pom-ng-account-%{_netfilter_snap}.patch
-Patch35:	pom-ng-ipp2p-%{_netfilter_snap}.patch
-Patch36:	pom-ng-rpc-%{_netfilter_snap}.patch
-########	End netfilter
-
 # from http://www.linuximq.net/patchs/linux-2.6.16-imq2.diff
 Patch50:	linux-2.6.16-imq2.diff
 
@@ -205,11 +179,6 @@
 Provides:	kernel-net-ipw2100 = 1.1.3
 Provides:	kernel-net-ipw2200 = 1.0.8
 Provides:	module-info
-#Obsoletes:	kernel-misc-fuse
-#Obsoletes:	kernel-modules
-#Obsoletes:	kernel-net-hostap
-#Obsoletes:	kernel-net-ieee80211
-#Obsoletes:	kernel-net-ipp2p
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
 Conflicts:	jfsutils < %{_jfsutils_ver}
@@ -347,10 +316,6 @@
 Provides:	kernel-smp-net-ipw2100 = 1.1.3
 Provides:	kernel-smp-net-ipw2200 = 1.0.8
 Provides:	module-info
-#Obsoletes:	kernel-smp-misc-fuse
-#Obsoletes:	kernel-smp-net-hostap
-#Obsoletes:	kernel-smp-net-ieee80211
-#Obsoletes:	kernel-smp-net-ipp2p
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
 Conflicts:	jfsutils < %{_jfsutils_ver}
@@ -539,11 +504,11 @@
 
 %description doc
 This is the documentation for the Linux kernel, as found in
-/usr/src/linux/Documentation directory.
+Documentation directory.
 
 %description doc -l pl
 Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
-/usr/src/linux/Documentation.
+Documentation.
 
 %prep
 %setup -q -n linux-%{version}%{_rc} 
@@ -571,32 +536,6 @@
 %patch8 -p1
 %patch9 -p1
 
-### netfilter
-# base
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-
-## extra
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-### end of netfilter
-
 %patch50 -p1
 
 %patch51 -p1
@@ -714,7 +653,7 @@
 	# squashfs
 	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 
-	# netfilter
+	# no netfilter
 	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
 
 %if %{with grsec_minimal}
@@ -1280,6 +1219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/05/01 23:09:33  sparky
+- netfilter throwed
+
 Revision 1.5  2006/05/01 22:36:14  sparky
 - added kernel-desktop-preempt_ppc_fix patch, now it build and works on ppc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-desktop.spec?r1=1.5&r2=1.6&f=u