add module-init-tools provides and obsoletes lines to spec

Help with the transition from module-init-tools to kmod by setting
provides and obsoletes, so that this package can replace
module-init-tools in the image builds.

Hopefully this fixes these build errors:
file /sbin/depmod conflicts between attempted installs of module-init-tools-3.12~pre2-3.1.i586 and kmod-5-1.1.i586
file /sbin/insmod conflicts between attempted installs of module-init-tools-3.12~pre2-3.1.i586 and kmod-5-1.1.i586
file /sbin/lsmod conflicts between attempted installs of module-init-tools-3.12~pre2-3.1.i586 and kmod-5-1.1.i586
file /sbin/modinfo conflicts between attempted installs of module-init-tools-3.12~pre2-3.1.i586 and kmod-5-1.1.i586
file /sbin/modprobe conflicts between attempted installs of module-init-tools-3.12~pre2-3.1.i586 and kmod-5-1.1.i586
file /sbin/rmmod conflicts between attempted installs of module-init-tools-3.12~pre2-3.1.i586 and kmod-5-1.1.i586

Signed-off-by: Chris Leech <christopher.leech@linux.intel.com>

diff --git a/packaging/kmod.changes b/packaging/kmod.changes
index 3c910a0..e4ffd10 100644 (file)
--- a/packaging/kmod.changes
+++ b/packaging/kmod.changes
@@ -1,2 +1,6 @@
+* Mon Jun 18 2012 Chris Leech <christopher.leech@linux.intel.com> - 5
+- add module-init-tools provides and obsoletes lines to spec to aid
+  the transition from module-init-tools to kmod
+
 * Wed Jun 13 2012 William Douglas <william.douglas@intel.com> - 5
-- Add kmod version 5
\ No newline at end of file
+- Add kmod version 5

diff --git a/packaging/kmod.spec b/packaging/kmod.spec
index d9d6fbd..890ba5f 100644 (file)
--- a/packaging/kmod.spec
+++ b/packaging/kmod.spec
@@ -14,6 +14,9 @@ BuildRequires:        pkgconfig(zlib)
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+Provides:      module-init-tools = 4.0-1
+Obsoletes:     module-init-tools < 4.0-1
+
 %description
 kmod is a set of tools to handle common tasks with Linux kernel modules like
 insert, remove, list, check properties, resolve dependencies and aliases.