packages: kernel/kernel.spec R: virtual(module-tools) instead of module-ini...

arekm arekm at pld-linux.org
Sun Feb 5 10:25:11 CET 2012


Author: arekm                        Date: Sun Feb  5 09:25:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
R: virtual(module-tools) instead of module-init-tools

---- Files affected:
packages/kernel:
   kernel.spec (1.1013 -> 1.1014) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.1013 packages/kernel/kernel.spec:1.1014
--- packages/kernel/kernel.spec:1.1013	Fri Feb  3 01:10:37 2012
+++ packages/kernel/kernel.spec	Sun Feb  5 10:25:05 2012
@@ -95,8 +95,6 @@
 %define		basever		3.2
 %define		postver		.1
 
-%define		module_init_tools_ver	3.16
-
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
 # alt_kernel should be defined if __alt_kernel has non-empty value (for %{?alt_kernel:foo} constructs)
@@ -291,17 +289,17 @@
 BuildRequires:	xz >= 1:4.999.7
 AutoReqProv:	no
 BuildRequires:	hostname
-BuildRequires:	module-init-tools >= %{module_init_tools_ver}
+BuildRequires:	virtual(module-tools)
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
 BuildRequires:	rpmbuild(macros) >= 1.217
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 10000-3
-Requires(post):	module-init-tools >= %{module_init_tools_ver}
+Requires(post):	virtual(module-tools)
 Requires:	/sbin/depmod
 Requires:	coreutils
 Requires:	geninitrd >= 10000-3
-Requires:	module-init-tools >= %{module_init_tools_ver}
+Requires:	virtual(module-tools)
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
 Requires:	cpuinfo(pae)
@@ -332,6 +330,7 @@
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
 Conflicts:	lvm2 < 2.02.40
+Conflicts:	module-init-tools < 3.16
 Conflicts:	nfs-utils < 1.0.5
 Conflicts:	oprofile < 0.9
 Conflicts:	ppp < 1:2.4.0
@@ -1500,6 +1499,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1014  2012/02/05 09:25:05  arekm
+R: virtual(module-tools) instead of module-init-tools
+
 Revision 1.1013  2012/02/03 00:10:37  glen
 - suggest linux-firmware to locate firmware for bnx2 drivers, like bnx2/bnx2-mips-06-6.2.1.fw
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.1013&r2=1.1014&f=u



More information about the pld-cvs-commit mailing list