SPECS: kernel-desktop.spec - keep also BR: module-init-tools - ada...

glen glen at pld-linux.org
Mon Oct 22 20:58:19 CEST 2007


Author: glen                         Date: Mon Oct 22 18:58:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- keep also BR: module-init-tools
- adapter

---- Files affected:
SPECS:
   kernel-desktop.spec (1.129 -> 1.130) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.129 SPECS/kernel-desktop.spec:1.130
--- SPECS/kernel-desktop.spec:1.129	Mon Oct 22 10:15:08 2007
+++ SPECS/kernel-desktop.spec	Mon Oct 22 20:58:14 2007
@@ -261,19 +261,15 @@
 Patch105:	kernel-desktop-rndis_host.patch
 
 URL:		http://www.kernel.org/
+BuildRequires:	/sbin/depmod
 BuildRequires:	binutils >= 3:2.14.90.0.7
 BuildRequires:	gcc >= 5:3.2
-BuildRequires:	/sbin/depmod
+BuildRequires:	module-init-tools
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
-Requires:	coreutils
-Requires:	geninitrd >= 8702
-Requires:	module-init-tools >= 0.9.9
-%{?with_bootsplash:Suggests:	bootsplash}
-%{?with_fbsplash:Suggests:	splashutils}
 Provides:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	kernel(netfilter) = %{_netfilter_snap}
@@ -291,6 +287,11 @@
 Provides:	kernel-smp-net-ipw2100 = 1.1.3
 Provides:	kernel-smp-net-ipw2200 = 1.0.8
 Provides:	module-info
+Requires:	coreutils
+Requires:	geninitrd >= 8702
+Requires:	module-init-tools >= 0.9.9
+%{?with_bootsplash:Suggests:	bootsplash}
+%{?with_fbsplash:Suggests:	splashutils}
 Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
 Conflicts:	jfsutils < %{_jfsutils_ver}
@@ -397,9 +398,9 @@
 Summary(de.UTF-8):	DRM Kernel Treiber
 Summary(pl.UTF-8):	Sterowniki DRM
 Group:		Base/Kernel
+Provides:	kernel-drm = %{drm_xfree_version}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
 Requires:	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	kernel-drm = %{drm_xfree_version}
 Autoreqprov:	no
 
 %description drm
@@ -416,10 +417,10 @@
 Summary(de.UTF-8):	PCMCIA Module
 Summary(pl.UTF-8):	Moduły PCMCIA
 Group:		Base/Kernel
-Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel(pcmcia)
 Provides:	kernel-pcmcia = %{pcmcia_version}
+Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Conflicts:	pcmciautils < %{_pcmciautils_ver}
 Autoreqprov:	no
@@ -501,8 +502,8 @@
 Summary(de.UTF-8):	Development Dateien die beim Kernel Modul kompilationen gebraucht werden
 Summary(pl.UTF-8):	Pliki służące do budowania modułów jądra
 Group:		Development/Building
-Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Provides:	kernel-module-build = %{epoch}:%{version}-%{release}
+Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description module-build
@@ -522,13 +523,13 @@
 Summary(de.UTF-8):	Der Kernel Quelltext
 Summary(pl.UTF-8):	Kod źródłowy jądra Linuksa
 Group:		Development/Building
-Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
 Provides:	kernel-source = %{epoch}:%{version}-%{release}
+Requires:	%{name}-module-build = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description source
-This is the source code for the Linux kernel. You can build a custom kernel
-that is better tuned to your particular hardware.
+This is the source code for the Linux kernel. You can build a custom
+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)
@@ -1127,6 +1128,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2007/10/22 18:58:14  glen
+- keep also BR: module-init-tools
+- adapter
+
 Revision 1.129  2007/10/22 08:15:08  glen
 - BR /sbin/depmod instead of module-init-tools due vserver-packages provides module-init-tools
 
================================================================

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



More information about the pld-cvs-commit mailing list