SPECS (aniolek): kernel.spec - copy spec from pluto (LINUX_2_6_11)...

aniolek aniolek at pld-linux.org
Tue Jun 14 16:52:25 CEST 2005


Author: aniolek                      Date: Tue Jun 14 14:52:25 2005 GMT
Module: SPECS                         Tag: aniolek
---- Log message:
- copy spec from pluto (LINUX_2_6_11)
- will be update to 2.6.12-rc6

---- Files affected:
SPECS:
   kernel.spec (1.441.2.951.2.29 -> 1.441.2.951.2.30) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.951.2.29 SPECS/kernel.spec:1.441.2.951.2.30
--- SPECS/kernel.spec:1.441.2.951.2.29	Thu Mar  3 00:31:48 2005
+++ SPECS/kernel.spec	Tue Jun 14 16:52:20 2005
@@ -1,34 +1,62 @@
 # $Revision$, $Date$
 #
 # TODO:
-#		- fix lirc_sasem (usb api)
 #		- add distcc support (and don't break crossbuild!)
-#		- fix vserver against new grsec
-#		- backport patch78 (expand-stack-race).
-#		- fix SMP version - it looks for modules in /lib/modules/2.6.X-Y
-#		  instead of 2.6.X-Ysmp
+#		- move em8300/lirc/iriverfs/squashfs stuff to separeated specs
 #
 # 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	grsec		# build without grsec
-#%bcond_with	vserver		# enable vserver (disables grsec)
-#%bcond_with	pax		# enable PaX
+%bcond_without	grsecurity	# disable grsecurity
+%bcond_with	pax		# enable PaX (depends on grsecurity)
+%bcond_with	omosix		# enable openMosix (conflicts with grsecurity/vserver)
+%bcond_with	vserver		# enable vserver (conflicts with grsecurity/omosix)
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	preemptive	# build preemptive kernel
-%bcond_with	regparm		# use register arguments (this break binary-only modules)
+%bcond_with	regparm		# (ix86) use register arguments (this break binary-only modules)
+%bcond_with	em8300		# DXR3/Hollywood
+%bcond_with	xen0		# build Xen0 kernel
+%bcond_with	xenU		# build XenU kernel
 
-%{?debug:%define with_verbose 1}
-
-#%if %{with vserver}
-#%undefine	with_grsec
-#%endif
+%if %{with xen0} || %{with xenU}
+%define with_xen 1
+%endif
 
-%if !%{with grsec}
+%if !%{with grsecurity}
 %undefine	with_pax
 %endif
 
+%ifnarch %{ix86} %{x8664} ppc
+%undefine	with_omosix
+%endif
+
+%if %{with omosix}
+%undefine	with_smp
+%endif
+
+%if %{with omosix} && %{with vserver}
+openmosix conflicts with vserver
+%endif
+
+%if %{with grsecurity} && %{with omosix}
+grsecurity conflicts with omosix
+%endif
+
+%if %{with grsecurity} && %{with vserver}
+grsecurity conflicts with vserver
+%endif
+
+%if %{with xen} && %{with grsecurity}
+xen conflicts with grsecurity
+%endif
+
+%if %{with xen0} && %{with xenU}
+xen0 conflicts with xenU
+%endif
+
+%{?debug:%define with_verbose 1}
+
 %ifarch sparc
 # sparc32 is missing important updates from 2.5 cycle - won't build
 %undefine	with_smp
@@ -38,6 +66,11 @@
 %undefine	with_up
 %endif
 
+%if %{with xen}
+# xen (for now) is only UP
+%undefine	with_smp
+%endif
+
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12
 %define		_util_linux_ver		2.10o
@@ -54,13 +87,9 @@
 %define		_procps_ver		3.2.0
 %define		_oprofile_ver		0.5.3
 
-#define		_post_ver	.1
-%define		_post_ver	%{nil}
-%define		_rel		0.28
-%define		_cset		20050302_0807
-%define		_apply_cset	0
+%define		_rel		3
 
-%define		_netfilter_snap		20041118
+%define		_netfilter_snap		20050611
 
 %define		_enable_debug_packages			0
 %define		no_install_post_strip			1
@@ -73,122 +102,169 @@
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
-Name:		kernel
-Version:	2.6.11%{_post_ver}
+Name:		kernel%{?with_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+%define		_postver	.12
+#define		_postver	%{nil}
+Version:	2.6.11%{_postver}
 Release:	%{_rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 %define		_rc	%{nil}
+#define		_rc	-rc3
 #Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
-Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
-# Source0-md5:	f00fd1b5a80f52baf9d1d83acddfa325
-Source1:	%{name}-autoconf.h
-
-Source4:	http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/cset/cset-%{_cset}.txt.bz2
-
-Source20:	%{name}-i386.config
-Source21:	%{name}-i386-smp.config
-Source22:	%{name}-x86_64.config
-Source23:	%{name}-x86_64-smp.config
-Source24:	%{name}-sparc.config
-Source25:	%{name}-sparc-smp.config
-Source26:	%{name}-sparc64.config
-Source27:	%{name}-sparc64-smp.config
-Source28:	%{name}-alpha.config
-Source29:	%{name}-alpha-smp.config
-Source30:	%{name}-ppc.config
-Source31:	%{name}-ppc-smp.config
-Source32:	%{name}-ia64.config
-Source33:	%{name}-ia64-smp.config
-
-Source40:	%{name}.FAQ-pl
-
-Source80:	%{name}-netfilter.config
-Source90:	%{name}-grsec.config
-Source91:	%{name}-grsec+pax.config
-Source92:	%{name}-vserver.config
-
-#Patch0:		2.6.0-ksyms-add.patch
-#Patch1:		linux-2.6-alsa-1.0.8-silent-output.patch
-#Patch2:		2.6.0-t6-usb-irq.patch
-#Patch3:		2.6.0-t7-memleak-lkml.patch
-#Patch4:		2.6.0-t7-memleak2-lkml.patch
-#Patch6:		2.6.0-t8-VLSI-ix86-lkml.patch
-
-#Patch8:		2.6.0-t8-umsdos-lkml.patch
-#Patch9:		2.6.0-t9-acpi_osl-lkml.patch
-
-# http://www.consultmatt.co.uk/downloads/patches/kernel/2.6/
-#Patch10:		2.6.0-powernow-k7.patch
-#Patch11:		2.6.0-enable-radeon-igp-rendering.patch
-#Patch12:		2.6.0-omnikeys.patch
-
-#Patch13:		2.6.1-rc2-VLAN-NS83820-lkml.patch
-#Patch14:		linux-2.6-omnibook-20040916.patch
-#Patch15:		linux-2.6-enable-broken-advansys.patch
-#Patch16:		linux-alpha-isa.patch
-#Patch17:		2.6.4-psion-5mx.patch
-#Patch18:		2.6.5-sparc64-missing-include.patch
-#Patch19:		2.6.5-3C920b-Tornado.patch
-#Patch20:		2.6.5-i386-cmpxchg.patch
-#Patch21:		2.6.6-serial-fifo-lkml.patch
-#Patch22:		2.6.6-qsort-updated-lkml.patch
-#Patch23:		2.6.6-xfs-qsort-lkml.patch
-#Patch24:		2.6.7-bridge_sysfs-lkml.patch
-#Patch25:		2.6.7-alpha_compile.patch
-#Patch26:		2.6.7-ppc-asm-defs.patch
-#Patch27:		linux-ppc-oops.patch
-#Patch28:		linux-2.6-sparc-ksyms.patch
-
-#Patch30:		2.6.x-ppp_mppe.patch
-
-#Patch32:		2.6.x-TGA-fbdev-lkml.patch
-Patch33:		linux-kbuild-extmod.patch
-
-# framebuffer fixes
-Patch41:		linux-fbcon-margins.patch
+Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
+# Source0-md5:	7e3b6e630bb05c1a8c1ba46e010dbe44
+Source1:	kernel-autoconf.h
+Source2:	kernel-config.h
+
+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
+Source34:	kernel-xen0.config
+#Source35:	kernel-xen0-smp.config
+#Source36:	kernel-xenU.config
+
+Source40:	kernel.FAQ-pl
+
+Source80:	kernel-netfilter.config
+Source90:	kernel-grsec.config
+Source91:	kernel-grsec+pax.config
+Source92:	kernel-omosix.config
+Source93:	kernel-vserver.config
+Source94:	kernel-em8300.config
+Source95:	kernel-linuxabi.config
+
+Patch0:		2.6.0-ksyms-add.patch
+Patch1:		linux-2.6-version.patch
+
+Patch3:		2.6.0-t9-acpi_osl-lkml.patch
+Patch4:		linux-kbuild-extmod.patch
+Patch5:		kernel-MAX_INIT_ARGS.patch
+# http://www.kernel.org/pub/linux/devel/binutils/linux-2.6-seg-5.patch
+Patch6:		linux-2.6-seg-5.patch
+
+Patch10:	2.6.0-powernow-k7.patch
+
+Patch12:	2.6.0-omnikeys.patch
+Patch13:	2.6.1-rc2-VLAN-NS83820-lkml.patch
+Patch14:	linux-2.6-omnibook-20040916.patch
+Patch15:	linux-2.6-enable-broken-advansys.patch
+Patch16:	linux-alpha-isa.patch
+Patch17:	linux-fbcon-margins.patch
+
+Patch19:	2.6.5-3C920b-Tornado.patch
+Patch20:	2.6.5-i386-cmpxchg.patch
+Patch21:	2.6.6-serial-fifo-lkml.patch
+
+Patch25:	2.6.7-alpha_compile.patch
+Patch26:	2.6.7-ppc-asm-defs.patch
+Patch27:	linux-ppc-oops.patch
+Patch28:	linux-2.6-sparc-ksyms.patch
+Patch29:	linux-2.6-ppc-no-pc-serial.patch
+Patch30:	2.6.x-TGA-fbdev-lkml.patch
+Patch31:	linux-2.6-ppc-no-i8042.patch
 
 # netfilter
-#Patch50:	2.6.10-pom-ng-%{_netfilter_snap}.patch
-# http://l7-filter.sourceforge.net/
-#Patch52:	2.6.8-ipt_layer7.patch
-#Patch53:	2.6.10-esfq.patch
-# http://www.linuximq.net/patchs/linux-2.6.9-imq1.diff
-#Patch54:	2.6.10-imq.patch
-#Patch55:	2.6.4-wrr.patch
-#Patch56:	linux-2.6-netfilter-syms.patch
-
-# pseudo terminal fix for older glibc
-#Patch60:	%{name}-pts.patch
-#Patch61:	%{name}-MAX_INIT_ARGS.patch
-
-# http://tahoe.pl/patch.htm
-#Patch70:	http://www.tahoe.pl/drivers/tahoe9xx-2.6.4-5.patch
+Patch50:	linux-2.6-pom-ng-branch.diff
 
-# http://dev.gentoo.org/~spock/projects/gensplash/
-Patch72:	fbsplash-0.9.1-r2-2.6.11-rc4.patch
-Patch73:	squashfs2.1-patch
-Patch74:	linux-static-dev.patch
-Patch75:	ftp://ftp.kernel.org/pub/linux/kernel/people/mbligh/patches/2.6.6-rc3/2.6.6-rc3-mjb1/350-autoswap
-Patch76:	linux-2.6-lirc-0.7.patch
-#Patch78:	linux-2.6-expand-stack-race.patch
-
-# http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.10/
-#Patch90:	acpi-20041210-2.6.10.diff
+Patch52:	linux-2.6-esfq.patch
+# http://www.linuximq.net/patchs/linux-2.6.9-imq1.diff
+Patch53:	2.6.10-imq.patch
+Patch54:	2.6.4-wrr.patch
 
 # frpm http://www.ssi.bg/~ja/#routers
-#Patch100:	routes-2.6.10-11.diff
-
-# http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc2/2.6.10-rc-mm2/broken-out
-#Patch110:	linux-reiser4.patch.bz2
-
-#Patch200:	grsecurity-2.1.1-2.6.10-200501131222.patch
-#Patch201:	linux-2.6.10-secfix-200501071130.patch
+Patch56:	routes-2.6.11-12.diff
+# http://developer.osdl.org/shemminger/skge/
+Patch57:	linux-2.6-skge-0.5.patch
+# http://www.edoceo.com/creo/inotify/
+Patch58:	inotify-2.6.12-rc3.patch
+# derived from http://www.syskonnect.com/syskonnect/support/driver/zip/linux/install-8_18.tar.bz2
+Patch59:	linux-2.6-sk98lin-8.18.2.2.patch
+# http://dev.gentoo.org/~spock/projects/gensplash/
+Patch60:	fbsplash-0.9.2-2.6.11.patch
+# reserve dynamic minors for fbsplash and device mapper
+Patch61:	linux-static-dev.patch
+Patch62:	linux-2.6-lirc-0.7.patch
+# http://ifp-driver.sourceforge.net/
+Patch63:	iriverfs-r0.1.0.1.patch
+Patch64:	squashfs2.1-patch
+Patch65:	linux-reiser4-2.6.11-mm4.patch.bz2
+Patch66:	linux-2.6-alsa-1.0.8-azx.patch
 
-# linux vserver
-# adapted from http://vserver.13thfloor.at/Experimental/patch-2.6.10-vs1.9.3.17.diff
-#Patch250:	linux-2.6-vs.patch
+# http://tahoe.pl/patch.htm
+Patch80:	http://www.tahoe.pl/drivers/tahoe9xx-2.6.4-5.patch
+# psmouse extension for ThinkPad laptops from http://www.clarkson.edu/~evanchsa/
+Patch81:	trackpoint-2.6.11.patch
+
+# http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.11/
+Patch90:	acpi-20050309-2.6.11.diff
+
+# http://www.kismetwireless.net/download.shtml#orinoco2611
+Patch95:	orinoco-2.6.11-rfmon-dragorn-1.diff
+
+Patch100:	linux-2.6-nvidia-pci-ids.patch
+Patch101:	linux-2.6-pty-is-losing-bytes.patch
+Patch102:	linux-2.6-esp-corruption-cpu-bug.patch
+Patch103:	linux-2.6-tty-overrun-notify.patch
+Patch104:	linux-2.6-tcp-unaligned-access.patch
+Patch105:	linux-2.6-align-udp-packet.patch
+Patch106:	linux-2.6-smbfs.patch
+Patch107:	linux-2.6-jbd-temp-unlink.patch
+Patch108:	linux-2.6-vm-orphaned-pages.patch
+Patch109:	linux-2.6-reiserfs-page-leak.patch
+Patch110:	linux-2.6-bdi-provide-backing-device-capability-information.patch
+Patch111:	linux-2.6-iriver-backing-device-capability-information-fix.patch
+Patch112:	linux-2.6-sata-sil-corruption-lockup.patch
+Patch113:	linux-2.6-xfrm-policy-destructor.patch
+Patch114:	linux-2.6-dst-cache-overflow.patch
+Patch115:	linux-2.6-net-sundance-ip100A-pciids.patch
+Patch116:	linux-2.6-null-tty-driver-oops.patch
+Patch117:	linux-2.6-sata-sil-mod15write-workaround.patch
+Patch118:	linux-2.6-ext2-corruption.patch
+Patch119:	linux-2.6-quota-dropfix.patch
+Patch120:	linux-2.6-quota-format.patch
+Patch121:	linux-2.6-procfs-hardlink-counts.patch
+Patch122:	linux-2.6-cxt48-misdetection.patch
+Patch123:	linux-2.6-cpuid-x87-bit-on-AMD-falsely-marked-as-PNI.patch
+Patch124:	linux-2.6-tty-races.patch
+Patch125:	linux-2.6-jiffies-rounding.patch
+Patch126:	linux-2.6-cputime-misscalculation.patch
+Patch127:	linux-2.6-jfs-fsync-wrong-behavior.patch
+
+Patch129:	linux-2.6-vfs-two-read-without-clear-between.patch
+Patch130:	linux-2.6-fix-via82xx-resume.patch
+Patch131:	linux-2.6-ppc-fix-sleep-on-old-101-powerbook.patch
+
+Patch133:	linux-2.6-via82c586-irq-routing.patch
+Patch134:	linux-2.6-udp-locking.patch
+# derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/
+Patch135:	linux-2.6-unix-abi.patch
+
+# derived from http://www.grsecurity.net/grsecurity-2.1.5-2.6.11.7-200504111924.patch.gz
+Patch200:	grsecurity-2.1.5-2.6.11.7-200504111924.patch
+# http://openmosix.snarc.org/files/releases/2.6/
+# derived from openMosix-r570.patch
+Patch201:	linux-2.6-omosix.patch
+# vserver-2.0-pre4
+Patch202:	linux-2.6-vs2.patch
+# xen 2.0.6 http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
+Patch203:	linux-xen-2.0.6.patch
+
+Patch400:	kernel-gcc4.patch
+Patch401:	kernel-hotfixes.patch
+Patch402:	linux-em8300-2.6.11.2.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 2.14.90.0.7
@@ -198,16 +274,17 @@
 %endif
 BuildRequires:	module-init-tools
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.153
-BuildRequires:	sed >= 4.0
+BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
 PreReq:		coreutils
 PreReq:		module-init-tools >= 0.9.9
 PreReq:		geninitrd >= 2.57
+Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	%{name}-up = %{epoch}:%{version}-%{release}
+Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	module-info
-Provides:	%{name}(netfilter) = %{_netfilter_snap}
 Obsoletes:	kernel-modules
+Obsoletes:	kernel-net-ipp2p
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	module-init-tool < %{_module_init_tool_ver}
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
@@ -220,7 +297,11 @@
 Conflicts:	nfs-utils < %{_nfs_utils_ver}
 Conflicts:	procps < %{_procps_ver}
 Conflicts:	oprofile < %{_oprofile_ver}
-ExclusiveArch:	%{ix86} alpha amd64 ia64 ppc sparc sparc64
+%if %{with xen}
+ExclusiveArch:	%{ix86}
+%else
+ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc sparc sparc64
+%endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -258,7 +339,7 @@
 Group:		Base/Kernel
 PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	%{name}-drm = %{drm_xfree_version}
+Provides:	kernel-drm = %{drm_xfree_version}
 Autoreqprov:	no
 
 %description drm
@@ -273,7 +354,7 @@
 Group:		Base/Kernel
 PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	%{name}-pcmcia = %{pcmcia_version}
+Provides:	kernel-pcmcia = %{pcmcia_version}
 Provides:	kernel(pcmcia)
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Autoreqprov:	no
@@ -290,9 +371,6 @@
 Group:		Base/Kernel
 PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	alsa-driver
-Obsoletes:	alsa-driver
-Obsoletes:	alsa-driver-up
 Autoreqprov:	no
 
 %description sound-alsa
@@ -324,9 +402,10 @@
 PreReq:		coreutils
 PreReq:		module-init-tools >= 0.9.9
 PreReq:		geninitrd >= 2.26
-Provides:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kernel = %{epoch}:%{version}-%{release}
+Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	module-info
-Provides:	%{name}(netfilter) = %{_netfilter_snap}
+Obsoletes:	kernel-smp-net-ipp2p
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	module-init-tool < %{_module_init_tool_ver}
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
@@ -368,7 +447,7 @@
 Group:		Base/Kernel
 PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	%{name}-drm = %{drm_xfree_version}
+Provides:	kernel-drm = %{drm_xfree_version}
 Autoreqprov:	no
 
 %description smp-drm
@@ -383,7 +462,7 @@
 Group:		Base/Kernel
 PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	%{name}-pcmcia = %{pcmcia_version}
+Provides:	kernel-pcmcia = %{pcmcia_version}
 Provides:	kernel(pcmcia)
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Autoreqprov:	no
@@ -400,9 +479,6 @@
 Group:		Base/Kernel
 PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	alsa-driver
-Obsoletes:	alsa-driver
-Obsoletes:	alsa-driver-smp
 Autoreqprov:	no
 
 %description smp-sound-alsa
@@ -430,12 +506,13 @@
 Summary:	Header files for the Linux kernel
 Summary(pl):	Pliki nagłówkowe jądra Linuksa
 Group:		Base/Kernel
-Provides:	%{name}-headers(agpgart) = %{version}
-Provides:	%{name}-headers(reiserfs) = %{version}
-Provides:	%{name}-headers(bridging) = %{version}
+Provides:	kernel-headers(agpgart) = %{version}
+Provides:	kernel-headers(reiserfs) = %{version}
+Provides:	kernel-headers(bridging) = %{version}
 Provides:	kernel-i2c-devel
-Provides:	%{name}-headers(netfilter) = %{_netfilter_snap}
-Provides:	%{name}-headers(alsa-drivers)
+Provides:	kernel-headers(netfilter) = %{_netfilter_snap}
+Provides:	kernel-headers(alsa-drivers)
+Provides:	kernel-headers = %{epoch}:%{version}-%{release}
 Obsoletes:	kernel-i2c-devel
 Autoreqprov:	no
 
@@ -453,6 +530,7 @@
 Summary(pl):	Pliki służące do budowania modułów jądra
 Group:		Base/Kernel
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
+Provides:	kernel-module-build = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description module-build
@@ -468,6 +546,7 @@
 Summary(pl):	Kod źródłowy jądra Linuksa
 Group:		Base/Kernel
 Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
+Provides:	kernel-source = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description source
@@ -499,7 +578,7 @@
 Summary:	Kernel documentation
 Summary(pl):	Dokumentacja do jądra Linuksa
 Group:		Base/Kernel
-Provides:	%{name}-doc = %{version}
+Provides:	kernel-doc = %{version}
 Autoreqprov:	no
 
 %description doc
@@ -513,96 +592,120 @@
 %prep
 %setup -q -n linux-%{version}%{_rc}
 
-%if "%{_apply_cset}" != "0"
-bzcat %{SOURCE4} | patch -p1 -s
-%endif
-
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch6 -p1
-
-#%patch8 -p1
-#%patch9 -p1
-#%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
-#%patch23 -p1
-#patch24 -p1
-#%patch25 -p1
-#%patch26 -p1
-#%patch27 -p1
-#%patch28 -p1
-
-#patch30 -p1
+%patch0 -p1
+%patch1 -p0
 
-#patch32 -p1	NEEDS UPDATE
-%patch33 -p1
-
-%patch41 -p1
-
-# netfilter
-#%patch50 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+%patch10 -p1
+
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
<<Diff was trimmed, longer than 597 lines>>

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




More information about the pld-cvs-commit mailing list