SPECS (Titanium): kernel-desktop.spec - from kernel-livecd.spec

shadzik shadzik at pld-linux.org
Mon Mar 16 16:28:38 CET 2009


Author: shadzik                      Date: Mon Mar 16 15:28:38 2009 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- from kernel-livecd.spec

---- Files affected:
SPECS:
   kernel-desktop.spec (1.204 -> 1.204.2.1) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.204 SPECS/kernel-desktop.spec:1.204.2.1
--- SPECS/kernel-desktop.spec:1.204	Mon May 26 18:15:58 2008
+++ SPECS/kernel-desktop.spec	Mon Mar 16 16:28:32 2009
@@ -1,275 +1,88 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - http://www.zen-sources.org/ ?
-# - waiting for ck patch for 2.6.25
-# - http://dev.gentoo.org/~spock/projects/fbcondecor/ -
-#   fbsplash patch was renamed to fbcondecor and the gensplash project took the name of fbsplash.
-# - pcmcia moved to main pkg (pcmcia.ko only or subpkg killed?):
-#    ssb: Unknown symbol pcmcia_access_configuration_register
-#    ohci_hcd: Unknown symbol ssb_device_disable
-# - put together a default .config that makes sense for desktops
-# - make sure patch numbering is consistent and prepare it
-#   for the future
-# - investigate ppc-ICE patches from kernel.spec (does it fix the e1000 ICE?)
-# - investigate pwc-uncompress patch from kernel.spec
-# - investigate apparmor-caps patch from kernel.spec
-# - actively search for other superb enhancing patches
-#   (even the experimental ones, as kernel-desktop is not
-#   mainline kernel)
-# - check if we don't have newer netfilter (kernel.spec claims 2007) # - check for all patches update
-# - links and descriptions above al PatchesXXX and %patchXXX
-#
 # Conditional build:
-%bcond_without	source		# don't build kernel-source package
-%bcond_with		noarch		# build noarch packages
-%bcond_with		verbose		# verbose build (V=1)
-%bcond_with		preemptrt	# use realtime-preempt patch
-%bcond_without	tuxonice	# support for tuxonice (ex-suspend2)
-%bcond_without	ck			# Con Kolivas desktop improvements patchset
-%bcond_without	reiser4		# support for reiser4 fs (experimental)
-%bcond_without	squashfs	# support for squashfs
-%bcond_with		supermount	# support for supermount-ng
-%bcond_without	unionfs		# support for unionfs
-%bcond_with		grsec_minimal	# don't build grsecurity (minimal subset: proc,link,fifo,shm)
-%bcond_with		bootsplash	# build with bootsplash instead of fbcondecor
-%bcond_without	imq			# imq
-%bcond_without	wrr			# wrr support
-%bcond_with		laptop		# build with HZ=100
-%bcond_with		pae			# build PAE (HIGHMEM64G) support on uniprocessor
+%bcond_without	source		# don't build kernel-desktop-source package
+%bcond_without	pcmcia		# don't build pcmcia
+%bcond_with	verbose		# verbose build (V=1)
+%bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 
 %{?debug:%define with_verbose 1}
 
-%if %{with bootsplash}
-%undefine	with_fbcondecor
-%else
-%define		with_fbcondecor	1
-%endif
-
-%ifnarch %{ix86}
-%undefine	with_pae
-%endif
-
-%if "%{_arch}" == "noarch"
-%define		with_noarch	1
-%endif
-
-%ifarch %{ix86} ppc
+%define		have_drm	1
+%define		have_oss	1
+%define		have_sound	1
 %define		have_isa	1
-%else
-%define		have_isa	0
-%endif
 
-# alias --alt_kernel laptop to turn on laptop bcond
-%if "%{alt_kernel}" == "laptop"
-%define		with_laptop	1
-%endif
+%define		_basever		2.6.27
+%define		_postver		.19
+%define		_rel			3
 
-%if %{with laptop}
-%define		alt_kernel	laptop%{?with_pae:-pae}%{?with_preemptrt:_rt}
-%else
-%define		alt_kernel	desktop%{?with_pae:-pae}%{?with_preemptrt:_rt}
-%endif
+%define		_enable_debug_packages			0
 
-# Our Kernel ABI, increase this when you want out of source modules being rebuilt
-%define		KABI		1
+%define		alt_kernel	desktop%{?with_pae:-pae}
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
 # _localversion is just that without version for "> localversion"
-%define		_localversion %{KABI}
-%define		kernel_release %{version}_%{alt_kernel}-%{_localversion}
-%define		_kernelsrcdir	/usr/src/linux-%{version}_%{alt_kernel}
-
-%define		basever	2.6.25
-%define		postver	.3
-%define		rel		0.1
+%define		_localversion %{_rel}
+%define		kernel_release %{version}-%{alt_kernel}-%{_localversion}
 
-%define		pname	kernel-desktop
 Summary:	The Linux kernel (the core of the Linux operating system)
 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-%{alt_kernel}
-Version:	%{basever}%{postver}
-Release:	%{rel}
+Version:	%{_basever}%{_postver}
+Release:	%{_rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5:	db95a49a656a3247d4995a797d333153
+Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
+# Source0-md5:	b3e78977aa79d3754cb7f8143d7ddabd
+%if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	49c56cf1394b2286033bb10c7cef7260
-Source2:	kernel-vanilla-module-build.pl
-Source3:	kernel-config.py
-Source4:	kernel-config-update.py
-Source5:	kernel-multiarch.make
-Source6:	%{pname}-config.h
-Source7:	%{pname}-module-build.pl
-
-Source9:	%{pname}-common.config
-Source10:	%{pname}-preempt-rt.config
-Source11:	%{pname}-preempt-nort.config
-Source12:	%{pname}-tuxonice.config
-Source13:	%{pname}-patches.config
-Source14:	%{pname}-netfilter.config
-Source15:	%{pname}-grsec.config
-Source16:	%{pname}-wrr.config
-Source17:	%{pname}-fbcondecor.config
-Source18:	%{pname}-bootsplash.config
-Source19:	%{pname}-imq.config
-Source20:	%{pname}-reiser4.config
-Source21:	%{pname}-squashfs.config
-Source22:	%{pname}-unionfs.config
-
-###
-#	Patches
-###
-
-#Patch0:		%{pname}-preempt-rt.patch
-
-# Project suspend2 renamed to tuxonice
-# http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc5-for-2.6.24.patch.bz2
-Patch1:		%{pname}-tuxonice.patch
-
-### Con Kolivas patchset
-# http://waninkoko.info/ckpatches/2.6.24/
-Patch7:		%{pname}-ck.patch
-Patch8:		%{pname}-tuxonice-ck.patch
-
-Patch9:		%{pname}-grsec-minimal.patch
-
-### filesystems
-# previously based on ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/reiser4-for-2.6.22-2.patch.gz
-# now based on ftp.kernel.org:/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc8/2.6.24-rc8-mm1/broken-out/reiser4*
-Patch10:	%{pname}-reiser4.patch
-
-# http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tgz
-# squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch
-Patch11:	%{pname}-squashfs.patch
-
-# http://dl.sourceforge.net/sourceforge/supermount-ng/supermount-ng-2.2.2-2.6.22.1_madgus_gcc34.patch.gz
-Patch12:	%{pname}-supermount-ng.patch
-
-# http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.2.2_for_2.6.24-rc7.diff.gz
-Patch13:	%{pname}-unionfs.patch
-
-### hardware
-# tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
-Patch20:	%{pname}-tahoe9xx.patch
-
-# http://pred.dcaf-security.org/sata_nv-ncq-support-mcp51-mcp55-mcp61.patch
-# NCQ Functionality for newer nvidia chipsets (MCP{51,55,61}) by nvidia crew
-#Patch25:	%{pname}-sata_nv-ncq.patch
-# http://memebeam.org/free-software/toshiba_acpi/toshiba_acpi-dev_toshiba_test5-linux_2.6.21.patch
-Patch26:	%{pname}-toshiba-acpi.patch
-
-### console
-# ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.21.diff.gz
-Patch30:	%{pname}-bootsplash.patch
-# http://dev.gentoo.org/~spock/projects/fbcondecor/
-# http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.24-rc7.patch
-Patch31:	%{pname}-fbcondecor.patch
-
-########	netfilter snap
-## base
-Patch40:	%{pname}-pom-ng-IPV4OPTSSTRIP.patch
-Patch41:	%{pname}-pom-ng-ipv4options.patch
-Patch42:	%{pname}-pom-ng-set.patch
-Patch43:	%{pname}-pom-ng-u32.patch
-Patch44:	%{pname}-pom-ng-ROUTE.patch
-Patch45:	%{pname}-pom-ng-TARPIT.patch
-Patch46:	%{pname}-pom-ng-mms-conntrack-nat.patch
-Patch47:	%{pname}-pom-ng-IPMARK.patch
-Patch48:	%{pname}-pom-ng-connlimit.patch
-Patch49:	%{pname}-pom-ng-geoip.patch
-Patch50:	%{pname}-pom-ng-ipp2p.patch
-Patch51:	%{pname}-pom-ng-time.patch
-Patch52:	%{pname}-pom-ng-rsh.patch
-Patch53:	%{pname}-pom-ng-rpc.patch
-
-# based on http://www.svn.barbara.eu.org/ipt_account/attachment/wiki/Software/ipt_account-0.1.21-20070804164729.tar.gz?format=raw
-Patch67:	%{pname}-ipt_account.patch
-
-# based on http://www.intra2net.com/de/produkte/opensource/ipt_account/pom-ng-ipt_ACCOUNT-1.10.tgz
-Patch68:	%{pname}-ipt_ACCOUNT.patch
-
-# netfilter-layer7-v2.13.tar.gz from http://l7-filter.sf.net/
-Patch69:	%{pname}-layer7.patch
-########	End netfilter
-
-### net software
-# based on http://www.linuximq.net/patchs/linux-2.6.24-imq.diff
-# some people report problems when using imq with wrr.
-Patch70:	%{pname}-imq.patch
-
-# esfq from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
-Patch71:	%{pname}-esfq.patch
-
-# by Baggins request:
-# derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
-Patch72:	%{pname}-atm-vbr.patch
-Patch73:	%{pname}-atmdd.patch
-
-# wrr http://www.zz9.dk/patches/wrr-linux-070717-2.6.22.patch.gz
-Patch74:	%{pname}-wrr.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
-Patch75:	%{pname}-hostap.patch
-
-# http://www.ntop.org/PF_RING.html 20070610
-Patch76:	%{pname}-PF_RING.patch
-
-# The following patch extend the routing functionality in Linux
-# to support static routes (defined by user), new way to use the
-# alternative routes, the reverse path protection (rp_filter),
-# the NAT processing to use correctly the routing when multiple
-# gateways are used.
-# http://www.ssi.bg/~ja/routes-2.6.24-15.diff
-# We need to disable CONFIG_IP_ROUTE_MULTIPATH_CACHED
-Patch77:	%{pname}-routes.patch
-
-### Additional features
-# http://www.bullopensource.org/cpuset/ - virtual CPUs
-Patch85:	%{pname}-cpuset_virtualization.patch
-
-### Fixes
-Patch90:	kernel-mcpu=440.patch
-Patch91:	%{pname}-fbcon-margins.patch
-Patch92:	%{pname}-static-dev.patch
-Patch100:	%{pname}-small_fixes.patch
-# Wake-On-Lan fix for nForce drivers; using http://atlas.et.tudelft.nl/verwei90/nforce2/wol.html
-# Fix verified for that kernel version.
-Patch102:	%{pname}-forcedeth-WON.patch
-Patch103:	%{pname}-ueagle-atm-freezer.patch
-# investigate
-Patch104:	%{pname}-ppc-ICE.patch
+# Source1-md5:	c4745906f759fcf5e3510ebff5246e9a
+%endif
+
+Source2:	kernel-desktop-autoconf.h
+Source3:	kernel-desktop-config.h
+Source4:	kernel-desktop-module-build.pl
 
-# http://synce.svn.sourceforge.net/svnroot/synce/trunk/patches/linux-2.6.22-rndis_host-wm5.patch
-Patch105:	%{pname}-rndis_host.patch
+Source10:	kernel-desktop-x86.config
+Source11:	kernel-desktop-x86_64.config
 
-# add tty ioctl to figure physical device of the console. used by showconsole.spec (blogd)
-#Patch106:	kernel-TIOCGDEV.patch
+Patch0:		kernel-desktop-bootsplash.patch
+Patch1:		kernel-desktop-squashfs.patch
+Patch2:		kernel-desktop-security_inode_permission.patch
 
 URL:		http://www.kernel.org/
+BuildRequires:	binutils >= 3:2.18
 BuildRequires:	/sbin/depmod
-BuildRequires:	binutils >= 3:2.14.90.0.7
-BuildRequires:	%{kgcc_package} >= 5:3.2
-BuildRequires:	module-init-tools
+BuildRequires:	gcc >= 5:3.2
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
+BuildRequires:	rpm-build >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
+Requires(post):	coreutils
+Requires(post):	geninitrd >= 2.57
+Requires(post):	module-init-tools >= 0.9.9
 Requires:	/sbin/depmod
 Requires:	coreutils
-Requires:	geninitrd >= 9000.9
+Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
-%{?with_bootsplash:Suggests:	bootsplash}
-%{?with_fbcondecor:Suggests:	splashutils}
-Provides:	%{name}(vermagic) = %{kernel_release}
+Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
+Obsoletes:	kernel-misc-acer_acpi
+Obsoletes:	kernel-misc-fuse
+Obsoletes:	kernel-misc-uvc
+Obsoletes:	kernel-modules
+Obsoletes:	kernel-net-ar81
+Obsoletes:	kernel-net-hostap
+Obsoletes:	kernel-net-ieee80211
+Obsoletes:	kernel-net-ipp2p
+Obsoletes:	kernel-smp
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -279,59 +92,56 @@
 Conflicts:	ppp < 1:2.4.0
 Conflicts:	procps < 3.2.0
 Conflicts:	quota-tools < 3.09
-%if %{with reiser4}
-Conflicts:	reiser4progs < 1.0.0
-%endif
 Conflicts:	reiserfsprogs < 3.6.3
 Conflicts:	udev < 1:071
 Conflicts:	util-linux < 2.10o
 Conflicts:	xfsprogs < 2.6.0
-%{?with_noarch:BuildArch:	noarch}
-ExclusiveArch:	%{ix86} %{x8664} ppc noarch
+%if %{with pae}
+ExclusiveArch:  %{ix86}
+ExcludeArch:	i386 i486 i586
+%else
+ExclusiveArch:	%{ix86} %{x8664}
+%endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch %{ix86} %{x8664}
-%define		target_arch_dir	x86
+%define		target_arch_dir		x86
+%endif
+%ifnarch %{ix86} %{x8664}
+%define		target_arch_dir		%{_target_base_arch}
+%endif
+
+%ifarch %{ix86}
+%define		kernel_config		x86
 %else
-%define		target_arch_dir	%{_target_base_arch}
+%define		kernel_config		%{_target_base_arch}
 %endif
 
+%define		defconfig	arch/%{target_arch_dir}/defconfig
+
 # No ELF objects there to strip (skips processing 27k files)
 %define		_noautostrip	.*%{_kernelsrcdir}/.*
 %define		_noautochrpath	.*%{_kernelsrcdir}/.*
 
 %define		initrd_dir	/boot
 
-%define		topdir	%{_builddir}/%{name}-%{version}
-%define		srcdir	%{topdir}/linux-%{basever}
-%define		objdir		%{topdir}/%{targetobj}
-%define		targetobj	%{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
+%define		_kernelsrcdir	/usr/src/linux-%{version}-%{alt_kernel}
 
-%define		CommonOpts	HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
 %if "%{_target_base_arch}" != "%{_arch}"
-	%define	MakeOpts %{CommonOpts} ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
+	%define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
 	%define	DepMod /bin/true
 
 	%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
-	%define	MakeOpts %{CommonOpts} CC="%{kgcc}" ARCH=%{_target_base_arch}
+	%define	CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
 	%define	DepMod /sbin/depmod
 	%endif
 
 %else
-	%define MakeOpts %{CommonOpts} CC="%{kgcc}"
+	%define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
 	%define	DepMod /sbin/depmod
 %endif
 
-%define __features Enabled features:\
-%{?debug: - DEBUG}\
-%{?with_tuxonice: - TuxOnIce (formerly known as suspend2)}\
-%{?with_preemptrt: - realtime-preempt patch by Ingo Molar}\
-%{?with_ck: - desktop patchset by Con Kolivas}\
-%{?with_grsec_minimal: - grsecurity minimal}\
- - %{?with_bootsplash:bootsplash}%{?with_fbcondecor:fbcondecor (formerly known as fbsplash)}\
- - HZ=100%{!?with_laptop:0}
-
 %define Features %(echo "%{__features}" | sed '/^$/d')
 
 %description
@@ -342,7 +152,7 @@
 %{Features}
 
 %description -l de.UTF-8
-Das Kernel-Packet enthält den Linux-Kernel (vmlinuz), den Kern des
+Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des
 Linux-Betriebssystems. Der Kernel ist für grundliegende
 Systemfunktionen verantwortlich: Speicherreservierung,
 Prozeß-Management, Geräte Ein- und Ausgaben, usw.
@@ -369,6 +179,7 @@
 Summary(de.UTF-8):	vmlinux - dekompressiertes Kernel Bild
 Summary(pl.UTF-8):	vmlinux - rozpakowany obraz jądra
 Group:		Base/Kernel
+Obsoletes:	kernel-smp-vmlinux
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -384,7 +195,9 @@
 Summary(de.UTF-8):	DRM Kernel Treiber
 Summary(pl.UTF-8):	Sterowniki DRM
 Group:		Base/Kernel
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-smp-drm
 Autoreqprov:	no
 
 %description drm
@@ -401,7 +214,9 @@
 Summary(de.UTF-8):	PCMCIA Module
 Summary(pl.UTF-8):	Moduły PCMCIA
 Group:		Base/Kernel
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-smp-pcmcia
 Conflicts:	pcmcia-cs < 3.1.21
 Conflicts:	pcmciautils < 004
 Autoreqprov:	no
@@ -420,7 +235,9 @@
 Summary(de.UTF-8):	ALSA Kernel Module
 Summary(pl.UTF-8):	Sterowniki dźwięku ALSA
 Group:		Base/Kernel
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-smp-sound-alsa
 Autoreqprov:	no
 
 %description sound-alsa
@@ -437,7 +254,9 @@
 Summary(de.UTF-8):	OSS Kernel Module
 Summary(pl.UTF-8):	Sterowniki dźwięku OSS
 Group:		Base/Kernel
+Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	kernel-smp-sound-oss
 Autoreqprov:	no
 
 %description sound-oss
@@ -449,25 +268,22 @@
 %description sound-oss -l pl.UTF-8
 Sterowniki dźwięku OSS (Open Sound System).
 
-%package config
-Summary:	Kernel config and module symvers
-Summary(pl.UTF-8):	Konfiguracja jądra i wersje symboli
-Group:		Development/Building
-Autoreqprov:	no
-Conflicts:	rpmbuild(macros) < 1.433
+%package firmware
+Summary:	Firmware for Linux kernel drivers
+Summary(pl.UTF-8):	Firmware dla sterowników z jądra Linuksa
+Group:		System Environment/Kernel
 
-%description config
-Kernel config and module symvers.
+%description firmware
+Firmware for Linux kernel drivers.
 
-%description config -l pl.UTF-8
-Konfiguracja jądra i wersje symboli.
+%description firmware -l pl.UTF-8
+Firmware dla sterowników z jądra Linuksa.
 
 %package headers
 Summary:	Header files for the Linux kernel
 Summary(de.UTF-8):	Header Dateien für den Linux-Kernel
 Summary(pl.UTF-8):	Pliki nagłówkowe jądra Linuksa
 Group:		Development/Building
-Requires:	%{name}-config = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description headers
@@ -477,8 +293,8 @@
 
 %description headers -l de.UTF-8
 Dies sind die C Header Dateien für den Linux-Kernel, die definierte
-Strukturen und Konstante beinhalten, die beim rekompilieren des Kernels
-oder bei Kernel Modul kompilationen gebraucht werden.
+Strukturen und Konstante beinhalten, die beim rekompilieren des
+Kernels oder bei Kernel Modul kompilationen gebraucht werden.
 
 %description headers -l pl.UTF-8
 Pakiet zawiera pliki nagłówkowe jądra, niezbędne do rekompilacji jądra
@@ -490,6 +306,7 @@
 Summary(pl.UTF-8):	Pliki służące do budowania modułów jądra
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
+Conflicts:	rpmbuild(macros) < 1.321
 Autoreqprov:	no
 
 %description module-build
@@ -517,8 +334,8 @@
 kernel that is better tuned to your particular hardware.
 
 %description source -l de.UTF-8
-Das Kernel-Source-Packet enthält den source code (C/Assembler-Code)
-des Linux-Kernels. Die Source-Dateien werden gebraucht, um viele
+Das Kernel-Source-Paket enthält den source code (C/Assembler-Code) des
+Linux-Kernels. Die Source-Dateien werden gebraucht, um viele
 C-Programme zu kompilieren, da sie auf Konstanten zurückgreifen, die
 im Kernel-Source definiert sind. Die Source-Dateien können auch
 benutzt werden, um einen Kernel zu kompilieren, der besser auf Ihre
@@ -555,382 +372,214 @@
 /usr/src/linux/Documentation.
 
 %prep
-%setup -qc
-ln -s %{SOURCE2} kernel-module-build.pl
-ln -s %{SOURCE3} kernel-config.py
-ln -s %{SOURCE4} kernel-config-update.py
-ln -s %{SOURCE5} Makefile
-
-cd linux-%{basever}
-%if "%{postver}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
-%endif
-
-%if %{with tuxonice}
-%patch1 -p1
-%endif
-
-%if %{with preemptrt}
-#%patch0 -p1
-%endif
-
-%if %{with ck}
-%patch7 -p1
-%if %{with tuxonice}
-%patch8 -p1
-%endif
-%endif
-
-%if %{with grsec_minimal}
-%patch9 -p1
-%endif
+%setup -q -n linux-%{_basever}
 
-%if %{with reiser4}
-%patch10 -p1
-%endif
-
-%if %{with squashfs}
-%patch11 -p1
-%endif
-
-%if %{with supermount}
-%patch12 -p1
-%endif
-
-%if %{with unionfs}
-%patch13 -p1
-%endif
-
-### hardware
-%patch20 -p1
-%if 0
-#%patch25 -p1 # FIND UPDATE
-%endif
-# toshiba-acpi
-%patch26 -p1
-
-### console
-%if %{with bootsplash}
-%patch30 -p1
-%endif
-%if %{with fbcondecor}
-%patch31 -p1
+%if "%{_postver}" != "%{nil}"
+%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.204&r2=1.204.2.1&f=u



More information about the pld-cvs-commit mailing list