SPECS (LINUX_2_6): kernel.spec - merge from LINUX_2_6_20 - before ...

mguevara mguevara at pld-linux.org
Mon Apr 30 12:13:57 CEST 2007


Author: mguevara                     Date: Mon Apr 30 10:13:57 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- merge from LINUX_2_6_20 - before 2.6.21

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1704 -> 1.441.2.1705) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1704 SPECS/kernel.spec:1.441.2.1705
--- SPECS/kernel.spec:1.441.2.1704	Mon Feb 19 17:43:41 2007
+++ SPECS/kernel.spec	Mon Apr 30 12:13:51 2007
@@ -1,49 +1,44 @@
 # $Revision$, $Date$
 #
-# TODO 2.6.19:
+# STATUS: 2.6.20.6-2
+# - standard config includes vserver, suspend2 and grsec_minimal
+# - builds (alpha, i686, ppc, sparc64, x86_64) 
+# - builds --with vesafb_tng (i686)
+# - builds --with pax_full (i686, x86_64, ppc)
+# - builds --with pax (carme)
+# - builds --with grsec_full (alpha, i486, i686, ppc, sparc64, x86_64)
 #
-# - grsecurity patch update for 2.6.19.2 - 1 hunk failed in:
-#	arch/i386/kernel/smpboot.c
-#	drivers/char/mem.c
-#	scripts/Kbuild.include
-# - p4 fbsplash - needs update (bcond off)
-# - p200 linux-2.6-ppc-ICE-hacks.patch - untested - ppc needed
-# - separate PaX and grsecurity support - future
-# - update configs for up/smp i386 (almost done) 
-# - check status of kernel-suspend2.config 
-# - update configs for up/smp x86_64
-# - update configs for up/smp sparc
-# - update configs for up/smp sparc64
-# - update configs for up/smp alpha
-# - update configs for up/smp ppc
-# - update configs for up/smp ia64
-# - p5 vesafb-tng - needs update (bcond off)
-# - p51 reiser4 - needs update (bcond off)
-# - p50 imq - test (bcond off)
+# TODO 2.6.20.7
+# - test non default bconds for 2.6.20.7 (esp. fb related for i386)
+# - spec cleanup
 #
 # FUTURE:
-# - separate PaX and grsecurity support - future
-# - update xen patch for 2.6.19 
-# - wanpipe
-# - Linux ABI
+# - new alsa rc2 - 1.0.14rc2 is in 2.6.20-git10 tree and in 2.6.21 line
+# - update xen patch for 2.6.20
+# - Linux ABI - needs update.
+# - pom-ng quake3-conntrack-nat -> nf_conntrack ?
+# - pom-ng rpc -> ?
+# - pom-ng rtsp-conntrack -> nf_conntrack ?
+# - pom-ng talk-conntrack-nat -> nf_conntrack ?
+# - nf-hipac ?
+# - pax hooks for selinux (experimental)
 #
 # Conditional build:
-%bcond_without	smp		# don't build SMP kernel
-%bcond_without	up		# don't build UP kernel
 %bcond_without	source		# don't build kernel-source package
 %bcond_without	pcmcia		# don't build pcmcia
+%bcond_without	regparm		# if your blob doesn't work try disable this
 
 %bcond_with	abi		# build ABI support only ix86 !!
-%bcond_with	grsec_full	# build full grsecurity
-%bcond_with	pax		# build PaX and full grsecurity (todo: separate)
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	xen0		# added Xen0 support
 %bcond_with	xenU		# added XenU support
-%bcond_with	reiser4		# support for reiser4 fs
+%bcond_without	reiser4		# support for reiser4 fs (experimental)
 
-%bcond_without	grsecurity	# don't build grsecurity at all
+%bcond_without	grsecurity	# don't build grsecurity nor pax at all
 %bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
-%bcond_without	old_netfilter	# don't build old netfilter module [not supported in this time may not work]
+%bcond_with	grsec_full	# build full grsecurity
+%bcond_with	pax_full	# build pax and full grsecurity (ie. grsec_full && pax)
+%bcond_with	pax		# build pax support
 
 %bcond_with	fbsplash	# fbsplash instead of bootsplash
 %bcond_with	vesafb_tng	# vesafb-tng, vesafb replacement from gentoo
@@ -52,6 +47,10 @@
 
 %bcond_without	ide_acpi	# support for ide-acpi from SuSE
 %bcond_without	imq		# imq support
+%bcond_without	wrr		# wrr support
+
+%bcond_without	vserver		# support for VServer (enabled by default) 
+%bcond_without	suspend2	# support for Suspend2 (enabled by default)
 
 %{?debug:%define with_verbose 1}
 
@@ -59,12 +58,14 @@
 %undefine	with_grsec_full
 %undefine	with_grsec_minimal
 %undefine	with_pax
+%undefine	with_pax_full
 %endif
 
-%if %{with pax}
+%if %{with pax_full}
 %undefine	with_grsec_minimal
-%undefine	with_grsec_full
+%define		with_grsec_full		1
 %define		with_grsecurity		1
+%define		with_pax		1
 %endif
 
 %if %{with grsec_full}
@@ -74,13 +75,8 @@
 
 %if %{with grsec_minimal}
 %undefine	with_grsec_full
+%undefine	with_pax_full
 %define		with_grsecurity		1
-%undefine	with_pax
-%endif
-
-%ifarch ia64
-# broken
-%undefine	with_up
 %endif
 
 %ifnarch %{ix86}
@@ -123,9 +119,13 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			0.1
+%define		_basever		2.6.20
+%define		_postver		.7
+%define		_prepatch		%{nil}
+%define		_pre_rc			%{nil}
+%define		_rc			%{nil}
+%define		_rel			1
 
-%define		_old_netfilter_snap	20060504
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
 
@@ -136,58 +136,59 @@
 %define		pcmcia_version		3.1.22
 %define		drm_xfree_version	4.3.0
 
-%define		squashfs_version	3.1
+%define		squashfs_version	3.2
 %define		suspend_version		2.2.9
 
 %define		xen_version		3.0.2
 
 Summary:	The Linux kernel (the core of the Linux operating system)
-Summary(de.UTF-8):   Der Linux-Kernel (Kern des Linux-Betriebssystems)
-Summary(fr.UTF-8):   Le Kernel-Linux (La partie centrale du systeme)
-Summary(pl.UTF-8):   JÄ
dro Linuksa
+Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
+Summary(et.UTF-8):	Linuxi kernel (ehk operatsioonisĂźsteemi tuum)
+Summary(fr.UTF-8):	Le Kernel-Linux (La partie centrale du systeme)
+Summary(pl.UTF-8):	JÄ
dro Linuksa
 Name:		kernel%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
-%define		_basever	2.6.21
-%define		_postver	%{nil}
+
+%if "%{_prepatch}" == "%{nil}"
 Version:	%{_basever}%{_postver}
 Release:	%{_rel}
+%else
+Version:	%{_prepatch}
+Release:	0.%{_pre_rc}.%{_rel}
+%endif
+
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-%define		_rc	%{nil}
-#define		_rc	-rc7
 #Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
 Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2
-# Source0-md5:	443c265b57e87eadc0c677c3acc37e20
+# Source0-md5:	34b0f354819217e6a345f48ebbd8f13e
+%if "%{_prepatch}" != "%{nil}"
+Source90:	http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_prepatch}-%{_pre_rc}.bz2
+# Source90-md5:	b78873f8a3aff5bdc719fc7fb4c66a9b
+%endif
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	e8a9a6dc65da3f7b192e7caa969f9a1b
+# Source1-md5:	d56fd9b25c86144f47c0b9df4fc1f534
 %endif
+
 Source3:	kernel-autoconf.h
 Source4:	kernel-config.h
 Source5:	kernel-ppclibs.Makefile
 Source7:	kernel-module-build.pl
 
-#Source10:	http://suspend2.net/downloads/all/suspend2-%{suspend_version}-for-2.6.19-rc6.patch.bz2
-##Source10-md5:	ce94df22b93c74f1637d2429c1093ec7
-#Source12:	ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.17/reiser4-for-2.6.17-3.patch.gz
-##Source12-md5:	593c3296ddf40c5b116ee129781da341
-#Source14:	http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz
-##Source14-md5:	f2563a2d748c7480559e8d3ff77eb18a
+# TODO - cleanup
+Source14:	http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz
+# Source14-md5:	f2563a2d748c7480559e8d3ff77eb18a
 
 Source20:	kernel-i386.config
-Source21:	kernel-i386-smp.config
-Source22:	kernel-x86_64.config
-Source23:	kernel-x86_64-smp.config
-Source24:	kernel-sparc.config
-Source25:	kernel-sparc-smp.config
-Source26:	kernel-sparc64.config
-Source27:	kernel-sparc64-smp.config
-Source28:	kernel-alpha.config
-Source29:	kernel-alpha-smp.config
-Source30:	kernel-ppc.config
-Source31:	kernel-ppc-smp.config
-Source32:	kernel-ia64.config
-Source33:	kernel-ia64-smp.config
+Source21:	kernel-x86_64.config
+Source22:	kernel-sparc.config
+Source23:	kernel-sparc64.config
+Source24:	kernel-alpha.config
+Source25:	kernel-ppc.config
+Source26:	kernel-ia64.config
+Source27:	kernel-ppc64.config
+
 Source34:	kernel-abi.config
 
 Source40:	kernel-netfilter.config
@@ -201,32 +202,33 @@
 
 Source49:	kernel-pax.config
 Source50:	kernel-no-pax.config
+Source51:	kernel-grsec_minimal.config
 Source55:	kernel-imq.config
+Source56:	kernel-reiser4.config
+Source57:	kernel-wrr.config
 
 ###
 #	Patches
 ###
 
-Patch0:		linux-net-2.6.19.patch
-#
+# TODO: not compatible - still needed?
 # PATA ports on SATA Promise controller; patch based on:
 # http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch
-#
 Patch1:		linux-2.6-sata-promise-pata-ports.patch
 
 # tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
 Patch2:		tahoe9xx-2.6.11.5.patch
 
-#	ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.15.diff
-Patch3:		bootsplash-3.1.6-2.6.15.diff
-#	http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.19-rc2.patch
-Patch4:		fbsplash-0.9.2-r5-2.6.19-rc2.patch
+# ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.18.diff
+Patch3:		bootsplash-3.1.6-2.6.18.diff
+# http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.20-rc6.patch
+Patch4:		fbsplash-0.9.2-r5-2.6.20-rc6.patch
 
-# vesafb-tng: http://dev.gentoo.org/~spock/projects/vesafb-tng/archive/vesafb-tng-1.0-rc2-2.6.19-rc2.patch
-Patch5:		vesafb-tng-1.0-rc2-2.6.19-rc2.patch
+# http://dev.gentoo.org/~spock/projects/vesafb-tng/archive/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
+Patch5:		vesafb-tng-1.0-rc2-2.6.20-rc2.patch
 
-# squashfs based on http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.1-r2.tar.gz
-# from linux-2.6.18 with squashfs3.1-r2_for_2.6.19.patch applied
+# Directly from squashfs: http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz for linux-2.6.20
+#
 Patch6:		squashfs%{squashfs_version}-patch
 Patch7:		linux-alpha-isa.patch
 Patch8:		linux-fbcon-margins.patch
@@ -253,6 +255,9 @@
 Patch43:	pom-ng-ipp2p-%{_netfilter_snap}.patch
 Patch44:	pom-ng-time-%{_netfilter_snap}.patch
 
+# nf_conntrack ports
+Patch45:	nf_conntrack_mms.patch
+
 #layer7 with temporary fix
 Patch48:	kernel-2.6.18-layer7-2.7.patch
 Patch49:	kernel-2.6.18-layer7-2.7-2.6.19-fix.patch
@@ -269,37 +274,39 @@
 #	pom-ng-ROUTE-20061213.patch
 # 	pom-ng-TARPIT-20061213.patch
 #	pom-ng-mms-conntrack-nat-20061213.patch
+#	(note: mms-conntrack-nat depends on ip_conntrack - needs porting to nf_conntrack)
 # all below applied to sources with all preceeding patches applied:
 #	pom-ng-rsh-20061213.patch
 # [pom external]
 #	pom-ng-IPMARK-20061213.patch
 #	pom-ng-connlimit-20061213.patch
+#	(note: connlimit needs an additional patch to work with nf_conntrack -> p301)
 #	pom-ng-geoip-20061213.patch
 #	pom-ng-ipp2p-20061213.patch
 #	pom-ng-time-20061213.patch
 #
-# layer7: 
+# layer7:
 # 	kernel-2.6.18-layer7-2.7.patch
 
 ###
 #	End netfilter
 ###
 
-# based on 2.6.17 patch from http://www.linuximq.net/patchs/linux-2.6.17-imq1.diff, 
-# some stuff moved from net/sched/sch_generic.c to net/core/dev.c for 2.6.19 
-# compatibility. not tested. 
+# based on 2.6.17 patch from http://www.linuximq.net/patchs/linux-2.6.17-imq1.diff,
+# some stuff moved from net/sched/sch_generic.c to net/core/dev.c for 2.6.19
+# compatibility. not tested.
 
 Patch50:	linux-2.6.19-imq1.diff
 
-# from http://laurent.riffard.free.fr/reiser4/reiser4-for-2.6.19.patch.gz
-# based on http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.18/reiser4-for-2.6.18-3.patch.gz
-# with 9 pathes from reiserfs mailing-list.
-# details http://www.mail-archive.com/reiserfs-list@namesys.com/msg22492.html
-Patch51:	reiser4-for-2.6.19.patch
+# reiser4 based on ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.19/reiser4-for-2.6.19-3.patch.gz
+Patch51:	reiser4-for-2.6.19-3.patch
 
-# esfq
-# from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
+# wrr http://www.zz9.dk/patches/wrr-linux-051111-2.6.20.patch.gz
+Patch52:	wrr-linux-051111-2.6.20.patch
+
+# esfq from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
 Patch53:	esfq-kernel.patch
+
 # from http://memebeam.org/free-software/toshiba_acpi/
 Patch54:	linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
 # by Baggins request:
@@ -309,40 +316,31 @@
 
 Patch57:	linux-2.6-cpuset_virtualization.patch
 
-# Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_36.tar.bz2
-Patch60:	linux-2.6-sk98lin-8.36.1.3.patch
+# Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2
+Patch60:	linux-2.6-sk98lin_8.41.2.3.patch
 
-# http://www.suspend2.net/downloads/all/suspend2-2.2.9-for-2.6.19-rc6.patch.bz2
-Patch69:	suspend2-2.2.9-for-2.6.19-rc6.patch
+# based on http://www.suspend2.net/downloads/all/suspend2-2.2.9.11-for-2.6.20.patch.bz2
+Patch69:	linux-2.6-suspend2.patch
 Patch70:	linux-2.6-suspend2-avoid-redef.patch
 Patch71:	linux-2.6-suspend2-page.patch
-#Patch72:	linux-2.6-suspend2-off.patch
+#Patch72: linux-2.6-suspend2-off.patch
 Patch72:	kernel-2.6-ueagle-atm-freezer.patch
 
-# Fix for pcie cards against 2.6.18.1 from ftp://lwfinger.dynalias.org/patches
-Patch73:	kernel-bcm43xx-patch_2.6.18.1_for_PCI-E.patch
-
 # ide-acpi instead of nx8220 s3 suspend/resume hack
 # http://svn.uludag.org.tr/pardus/devel/kernel/kernel/files/suse/ide-acpi-support.patch
-Patch75:	linux-2.6.17-ide-acpi-support.patch
-
-# cx88-blackbird based tv tuner card audio fix
-Patch80:	linux-2.6.19-cx88-tvaudio.patch
-
-# see comments on http://lkml.org/lkml/2006/12/12/339
-Patch81:	linux-2.6.19-atiixp-legacy.patch
+Patch75:	linux-2.6-ide-acpi-support.patch
 
 # adds some ids for hostap suported cards and monitor_enable from/for aircrack-ng
-# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch 
+# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	hostap-kernel-2.6.18.patch
 
-# http://vserver.13thfloor.at/Experimental/patch-2.6.19.1-vs2.3.0.6.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.20.4-vs2.3.0.12.diff
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
 Patch102:	linux-2.6-vs2.1-128IPs.patch
 
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
-#Patch120:	xen-3.0-2.6.16.patch
+#Patch120: xen-3.0-2.6.16.patch
 
 # Wake-On-Lan fix for nForce drivers; using http://atlas.et.tudelft.nl/verwei90/nforce2/wol.html
 # Fix verified for that kernel version.
@@ -352,15 +350,49 @@
 
 # http://www.ssi.bg/~ja/routes-2.6.19-12.diff
 Patch300:	routes-2.6.19-12.diff
+Patch301:	pom-ng-connlimit-20061213_nf_conntrack_port.patch
+Patch302:	linux-2.6-layer7_nf_conntrack_port.patch
+
+Patch400:	kernel-bcm43xx-combined_2.6.20.2.patch
+
+# For compatibility with (not updated) blobs like ... ? 
+# Before 2.6.20 we had CONFIG_REGPARM option disabled.
+# Probably not needed anymore - it is bconded and disabled now
+Patch500:	linux-2.6.20_i386_regparm_off.patch
 
 Patch1000:	linux-2.6-grsec-minimal.patch
 
 Patch2000:	kernel-small_fixes.patch
+
+# Compilation with gcc-4.1.2:
+Patch2001:	kernel-proxy-pda.patch
+
+# Some non-GPL modules (nvidia, nvidia-legacy) looks for the paravirt_ops symbol
+Patch2100:	linux-2.6.20-paravirt_ops-needed-by-blobs.patch
+
+# kill some thousands of warnings
+Patch2500:	linux-2.6-warnings.patch
+
 #wanpipe
-#Patch3000:	wanpipe-beta7-2.3.4.patch
+#Patch3000: wanpipe-beta7-2.3.4.patch
+
+# gfs2 and dlm modules ported from 2.6.21rc5, current are broken
+Patch4000:	linux-2.6-gfs2_dlm-2.6.21.patch
+
+Patch5000:	apparmor-2.6.20.3-v405-fullseries.diff
+Patch5001:	linux-2.6-apparmor-caps.patch
+
+# not ready yet
+Patch9997:	pax_selinux_hooks-2.6.20.patch
 
-# use http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.19.1-200612121859.patch
-Patch9999:	grsecurity-2.1.9-2.6.19.1.patch
+# based on http://www.grsecurity.net/~paxguy1/pax-linux-2.6.20.7-test15.patch
+Patch9998:	pax-linux-2.6.20.patch
+
+# based on http://www.grsecurity.net/~spender/grsecurity-2.1.10-2.6.20.6-200704091818.patch
+# with pax updates from http://www.grsecurity.net/~paxguy1/pax-linux-2.6.20.7-test15.patch
+Patch9999:	grsecurity-2.1.10-2.6.20.3.patch
+Patch10000:	linux-2.6-grsec-caps.patch
+Patch10001:	linux-2.6-grsec-common.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -380,8 +412,6 @@
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
-Provides:	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
 Provides:	kernel(realtime-lsm) = 0.1.1
@@ -395,6 +425,7 @@
 Provides:	kernel-net-ipw2100 = 1.1.3
 Provides:	kernel-net-ipw2200 = 1.0.8
 Provides:	module-info
+Obsoletes:	kernel-smp
 Obsoletes:	kernel-misc-fuse
 Obsoletes:	kernel-modules
 Obsoletes:	kernel-net-hostap
@@ -433,7 +464,7 @@
 %endif
 
 # kernel release (used in filesystem and eventually in uname -r)
-# modules will be looked from /lib/modules/%{kernel_release}%{?smp}
+# modules will be looked from /lib/modules/%{kernel_release}
 # _localversion is just that without version for "> localversion"
 %define		_localversion %{release}
 %define		kernel_release %{version}-%{_localversion}
@@ -463,10 +494,9 @@
 Most hardware is instead supported by modules loaded after booting.
 
 Netfilter module dated: %{_netfilter_snap}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
+%{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
+%{?with_pax:PaX support - enabled}
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
@@ -480,10 +510,9 @@
 ProzeĂŸ-Management, Geräte Ein- und Ausgaben, usw.
 
 Netfilter module dated: %{_netfilter_snap}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
+%{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
+%{?with_pax:PaX support - enabled}
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
@@ -497,10 +526,9 @@
 allocation de process, entrĂŠe/sortie de peripheriques, etc.
 
 Netfilter module dated: %{_netfilter_snap}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
+%{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
+%{?with_pax:PaX support - enabled}
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
@@ -513,10 +541,9 @@
 siÄ™ w komputerze, takiego jak sterowniki dyskĂłw itp.
 
 Netfilter module dated: %{_netfilter_snap}
-%{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
-%{?with_abi:Linux ABI suppor - enabled}
+%{?with_abi:Linux ABI support - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
-%{?with_pax:PaX and Grsecurity full support - enabled}
+%{?with_pax:PaX support - enabled}
 %{?with_xen0:Xen 0 - enabled}
 %{?with_xenU:Xen U - enabled}
 %{?with_fbsplash:Fbsplash - enabled }
@@ -527,6 +554,7 @@
 Summary:	vmlinux - uncompressed kernel image
 Summary(pl.UTF-8):   vmlinux - rozpakowany obraz jÄ
dra
 Group:		Base/Kernel
+Obsoletes:	kernel-smp-vmlinux
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -536,11 +564,12 @@
 
 %package drm
 Summary:	DRM kernel modules
-Summary(pl.UTF-8):   Sterowniki DRM
+Summary(pl.UTF-8):	Sterowniki DRM
 Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	kernel-drm = %{drm_xfree_version}
+Obsoletes:	kernel-smp-drm
 Autoreqprov:	no
 
 %description drm
@@ -551,12 +580,13 @@
 
 %package pcmcia
 Summary:	PCMCIA modules
-Summary(pl.UTF-8):   Moduły PCMCIA
+Summary(pl.UTF-8):	Moduły PCMCIA
 Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	kernel(pcmcia)
 Provides:	kernel-pcmcia = %{pcmcia_version}
+Obsoletes:	kernel-smp-pcmcia
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Conflicts:	pcmciautils < %{_pcmciautils_ver}
 Autoreqprov:	no
@@ -569,10 +599,11 @@
 
 %package libs
 Summary:	Libraries for preparing bootable kernel on PowerPCs
-Summary(pl.UTF-8):   Biblioteki do przygotowania bootowalnego jÄ
dra dla PowerPC
+Summary(pl.UTF-8):	Biblioteki do przygotowania bootowalnego jÄ
dra dla PowerPC
 Group:		Base/Kernel
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	mkvmlinuz >= %{_mkvmlinuz_ver}
+Obsoletes:	kernel-smp-libs
 Autoreqprov:	no
 
 %description libs
@@ -585,10 +616,11 @@
 
 %package sound-alsa
 Summary:	ALSA kernel modules
-Summary(pl.UTF-8):   Sterowniki dźwięku ALSA
+Summary(pl.UTF-8):	Sterowniki dźwięku ALSA
 Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-smp-sound-alsa
 Autoreqprov:	no
 
 %description sound-alsa
@@ -599,10 +631,11 @@
 
 %package sound-oss
 Summary:	OSS kernel modules
-Summary(pl.UTF-8):   Sterowniki dźwięku OSS
+Summary(pl.UTF-8):	Sterowniki dźwięku OSS
 Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-smp-sound-oss
<<Diff was trimmed, longer than 597 lines>>

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



More information about the pld-cvs-commit mailing list