SPECS (LINUX_2_6): kernel.spec - adapterized (fixed binutils epoch)

glen glen at pld-linux.org
Sun Jan 29 12:43:55 CET 2006


Author: glen                         Date: Sun Jan 29 11:43:55 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- adapterized (fixed binutils epoch)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1383 -> 1.441.2.1384) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1383 SPECS/kernel.spec:1.441.2.1384
--- SPECS/kernel.spec:1.441.2.1383	Sun Jan 29 01:35:45 2006
+++ SPECS/kernel.spec	Sun Jan 29 12:43:50 2006
@@ -370,7 +370,7 @@
 Patch403:	kernel-2.6-pcmcia.patch
 
 URL:		http://www.kernel.org/
-BuildRequires:	binutils >= 2.14.90.0.7
+BuildRequires:	binutils >= 3:2.14.90.0.7
 BuildRequires:	diffutils
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
@@ -381,11 +381,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
@@ -401,20 +401,20 @@
 Obsoletes:	kernel-net-hostap
 Obsoletes:	kernel-net-ieee80211
 Obsoletes:	kernel-net-ipp2p
-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}
@@ -459,8 +459,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
 
@@ -474,10 +474,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
 
@@ -491,24 +491,24 @@
 Summary:	Libraries for preparing bootable kernel on PowerPCs
 Summary(pl):	Biblioteki do przygotowania bootowalnego jądra dla PowerPC
 Group:		Base/Kernel
-PreReq:		mkvmlinuz
 Requires:	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	mkvmlinuz
 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
@@ -521,8 +521,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
@@ -537,9 +537,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}
@@ -555,18 +555,18 @@
 Obsoletes:	kernel-smp-net-hostap
 Obsoletes:	kernel-smp-net-ieee80211
 Obsoletes:	kernel-smp-net-ipp2p
-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
@@ -594,8 +594,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
 
@@ -609,10 +609,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
 
@@ -626,13 +626,13 @@
 Summary:	Libraries for preparing bootable SMP kernel on PowerPCs
 Summary(pl):	Biblioteki do przygotowania bootowalnego jądra dla wieloprocesorowych PowerPC
 Group:		Base/Kernel
-PreReq:		mkvmlinuz
 Requires:	%{name}-smp = %{epoch}:%{version}-%{release}
+Requires:	mkvmlinuz
 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
@@ -642,8 +642,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
@@ -657,8 +657,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
@@ -671,13 +671,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
 
@@ -1798,6 +1798,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1384  2006/01/29 11:43:50  glen
+- adapterized (fixed binutils epoch)
+
 Revision 1.441.2.1383  2006/01/29 00:35:45  blekot
 - updated alsa-git patch
 
================================================================

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



More information about the pld-cvs-commit mailing list