SPECS (LINUX_2_6_14): kernel.spec - provide kernel-module-build %{...

glen glen at pld-linux.org
Thu Sep 28 23:46:30 CEST 2006


Author: glen                         Date: Thu Sep 28 21:46:30 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_14
---- Log message:
- provide kernel-module-build %{_basever} for external module building
- adapterized

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1357.2.32 -> 1.441.2.1357.2.33) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1357.2.32 SPECS/kernel.spec:1.441.2.1357.2.33
--- SPECS/kernel.spec:1.441.2.1357.2.32	Mon Mar 27 21:42:10 2006
+++ SPECS/kernel.spec	Thu Sep 28 23:46:24 2006
@@ -164,20 +164,21 @@
 %define		pcmcia_version		3.1.22
 %define		drm_xfree_version	4.3.0
 
+%define		_basever	2.6.14
+%define		_postver	.7
+#define		_postver	%{nil}
+%define		_rc	%{nil}
+#define		_rc	-rc5
 Summary:	The Linux kernel (the core of the Linux operating system)
 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%{?with_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_preemptive:-preempt}
-%define		_postver	.7
-#define		_postver	%{nil}
-Version:	2.6.14%{_postver}
+Version:	%{_basever}%{_postver}
 Release:	%{_rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-%define		_rc	%{nil}
-#define		_rc	-rc5
 #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-%{version}%{_rc}.tar.bz2
 # Source0-md5:	cdc8b60949f1cea6634fd9cfe9670ada
@@ -374,7 +375,6 @@
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 2.14.90.0.7
-BuildRequires:	diffutils
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
@@ -384,11 +384,11 @@
 BuildRequires:	perl-base
 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}
+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
@@ -402,20 +402,20 @@
 Obsoletes:	kernel-modules
 Obsoletes:	kernel-net-hostap
 Obsoletes:	kernel-net-ieee80211
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	reiser4progs < %{_reiser4progs_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
 Conflicts:	PPP < %{_PPP_ver}
+Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
+Conflicts:	jfsutils < %{_jfsutils_ver}
+Conflicts:	module-init-tool < %{_module_init_tool_ver}
 Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	procps < %{_procps_ver}
 Conflicts:	oprofile < %{_oprofile_ver}
+Conflicts:	procps < %{_procps_ver}
+Conflicts:	quota-tools < %{_quota_tools_ver}
+Conflicts:	reiser4progs < %{_reiser4progs_ver}
+Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	udev < %{_udev_ver}
+Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	xfsprogs < %{_xfsprogs_ver}
 %if %{with xen}
 %if %{with xendev}
 ExclusiveArch:	%{ix86} %{x8664}
@@ -471,8 +471,8 @@
 Summary:	DRM kernel modules
 Summary(pl):	Sterowniki DRM
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel-drm = %{drm_xfree_version}
 Autoreqprov:	no
 
@@ -486,10 +486,10 @@
 Summary:	PCMCIA modules
 Summary(pl):	Moduły PCMCIA
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	kernel-pcmcia = %{pcmcia_version}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel(pcmcia)
+Provides:	kernel-pcmcia = %{pcmcia_version}
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Autoreqprov:	no
 
@@ -508,19 +508,19 @@
 Autoreqprov:	no
 
 %description libs
-Libraries for preparing bootable kernel on PowerPCs.
-Script called mkvmlinuz may be useful for this.
+Libraries for preparing bootable kernel on PowerPCs. Script called
+mkvmlinuz may be useful for this.
 
 %description libs -l pl
-Biblioteki do przygotowania bootowalnego jądra dla PowerPC.
-Skrypt mkvmlinuz może być do tego przydatny.
+Biblioteki do przygotowania bootowalnego jądra dla PowerPC. Skrypt
+mkvmlinuz może być do tego przydatny.
 
 %package sound-alsa
 Summary:	ALSA kernel modules
 Summary(pl):	Sterowniki dźwięku ALSA
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description sound-alsa
@@ -533,8 +533,8 @@
 Summary:	OSS kernel modules
 Summary(pl):	Sterowniki dźwięku OSS
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description sound-oss
@@ -549,9 +549,9 @@
 Summary(fr):	Kernel version %{version} compiler pour les machine Multi-Processeur
 Summary(pl):	Jądro Linuksa w wersji %{version} dla maszyn wieloprocesorowych
 Group:		Base/Kernel
-PreReq:		coreutils
-PreReq:		module-init-tools >= 0.9.9
-PreReq:		geninitrd >= 2.26
+Requires:	coreutils
+Requires:	geninitrd >= 2.26
+Requires:	module-init-tools >= 0.9.9
 Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	kernel(nf-hipac) = %{_nf_hipac_ver}
@@ -565,18 +565,18 @@
 Obsoletes:	kernel-smp-misc-fuse
 Obsoletes:	kernel-smp-net-hostap
 Obsoletes:	kernel-smp-net-ieee80211
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
 Conflicts:	PPP < %{_PPP_ver}
+Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
+Conflicts:	jfsutils < %{_jfsutils_ver}
+Conflicts:	module-init-tool < %{_module_init_tool_ver}
 Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	procps < %{_procps_ver}
 Conflicts:	oprofile < %{_oprofile_ver}
+Conflicts:	procps < %{_procps_ver}
+Conflicts:	quota-tools < %{_quota_tools_ver}
+Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
+Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	xfsprogs < %{_xfsprogs_ver}
 Autoreqprov:	no
 
 %description smp
@@ -615,8 +615,8 @@
 Summary:	DRM SMP kernel modules
 Summary(pl):	Sterowniki DRM dla maszyn wieloprocesorowych
 Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
+Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
 Provides:	kernel-drm = %{drm_xfree_version}
 Autoreqprov:	no
 
@@ -630,10 +630,10 @@
 Summary:	PCMCIA modules for SMP kernel
 Summary(pl):	Moduły PCMCIA dla maszyn SMP
 Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
-Provides:	kernel-pcmcia = %{pcmcia_version}
+Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
 Provides:	kernel(pcmcia)
+Provides:	kernel-pcmcia = %{pcmcia_version}
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Autoreqprov:	no
 
@@ -652,8 +652,8 @@
 Autoreqprov:	no
 
 %description smp-libs
-Libraries for preparing bootable SMP kernel on PowerPCs.
-Script called mkvmlinuz may be useful for this.
+Libraries for preparing bootable SMP kernel on PowerPCs. Script called
+mkvmlinuz may be useful for this.
 
 %description smp-libs -l pl
 Biblioteki do przygotowania bootowalnego jądra dla wieloprocesorowych
@@ -663,8 +663,8 @@
 Summary:	ALSA SMP kernel modules
 Summary(pl):	Sterowniki dźwięku ALSA dla maszyn wieloprocesorowych
 Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
+Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description smp-sound-alsa
@@ -678,8 +678,8 @@
 Summary:	OSS SMP kernel modules
 Summary(pl):	Sterowniki dźwięku OSS dla maszyn wieloprocesorowych
 Group:		Base/Kernel
-PreReq:		%{name}-smp = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-smp = %{epoch}:%{version}-%{release}
+Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description smp-sound-oss
@@ -692,13 +692,13 @@
 Summary:	Header files for the Linux kernel
 Summary(pl):	Pliki nagłówkowe jądra Linuksa
 Group:		Development/Building
+Provides:	kernel-headers = %{epoch}:%{version}-%{release}
 Provides:	kernel-headers(agpgart) = %{version}
-Provides:	kernel-headers(reiserfs) = %{version}
+Provides:	kernel-headers(alsa-drivers)
 Provides:	kernel-headers(bridging) = %{version}
-Provides:	kernel-i2c-devel
 Provides:	kernel-headers(netfilter) = %{_netfilter_snap}
-Provides:	kernel-headers(alsa-drivers)
-Provides:	kernel-headers = %{epoch}:%{version}-%{release}
+Provides:	kernel-headers(reiserfs) = %{version}
+Provides:	kernel-i2c-devel
 Obsoletes:	kernel-i2c-devel
 Autoreqprov:	no
 
@@ -717,6 +717,7 @@
 Group:		Base/Kernel
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
+Provides:	kernel-module-build = %{epoch}:%{_basever}
 Provides:	kernel-module-build = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
@@ -1821,6 +1822,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1357.2.33  2006/09/28 21:46:24  glen
+- provide kernel-module-build %{_basever} for external module building
+- adapterized
+
 Revision 1.441.2.1357.2.32  2006/03/27 19:42:10  arekm
 - it no longer provides ipp2p
 
================================================================

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



More information about the pld-cvs-commit mailing list