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

[glen]

Author: glen                         Date: Sun Oct 29 23:09:27 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- provide kernel-module-build %{_basever} for external module building

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1648 -> 1.441.2.1649) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1648 SPECS/kernel.spec:1.441.2.1649
--- SPECS/kernel.spec:1.441.2.1648	Thu Oct 19 07:14:06 2006
+++ SPECS/kernel.spec	Mon Oct 30 00:09:21 2006
@@ -296,8 +296,6 @@
 %endif
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	module-init-tools
-# That package provides dummy module-init-tools:
-Conflicts:	vserver-packages
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
@@ -342,6 +340,7 @@
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	vserver-packages
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
 %if %{with xen0} || %{with xenU}
 ExclusiveArch:	%{ix86}
@@ -549,6 +548,7 @@
 Conflicts:	reiser4progs < %{_reiser4progs_ver}
 Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	vserver-packages
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
 Autoreqprov:	no
 
@@ -728,6 +728,7 @@
 Summary(pl):	Pliki służące do budowania modułów jądra
 Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
+Provides:	kernel-module-build = %{epoch}:%{_basever}
 Provides:	kernel-module-build = %{epoch}:%{version}-%{release}
 Conflicts:	rpmbuild(macros) < 1.321
 Autoreqprov:	no
@@ -1756,6 +1757,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1649  2006/10/29 23:09:21  glen
+- provide kernel-module-build %{_basever} for external module building
+
 Revision 1.441.2.1648  2006/10/19 05:14:06  matkor
 - Release 4. One more bcm43xx fix.
 
================================================================

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