rpms/device-mapper-multipath/devel device-mapper-multipath.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19372

Modified Files:
	device-mapper-multipath.spec 
Log Message:
- unsplit kpartx



Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- device-mapper-multipath.spec	15 Nov 2005 05:12:57 -0000	1.11
+++ device-mapper-multipath.spec	1 Dec 2005 19:40:11 -0000	1.12
@@ -13,7 +13,7 @@
 Patch4: move_cache_file.patch
 Patch5: cache_open_mode.patch
 Patch6: init.patch
-Requires: kpartx = %{version}-%{release}
+Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: sysfsutils-devel,device-mapper
 
@@ -24,13 +24,6 @@
 * multipath :   Scan the system for multipath devices and assemble them.
 * multipathd :  Detects when paths fail and execs multipath to update things.
 
-%package -n kpartx
-Summary: kpartx probes device-mapper volumes for partitions.
-Group: System Environment/Base
-
-%description -n kpartx
-kpartx probes device-mapper volumes for partitions.
-
 %prep
 %setup -q -n multipath-tools-0.4.4.2
 
@@ -74,6 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
+/sbin/kpartx
 /sbin/multipath
 /sbin/multipathd
 %{_mandir}/man8/kpartx.8.gz
@@ -85,9 +79,12 @@
 
 %files -n kpartx
 %defattr(-,root,root,-)
-/sbin/kpartx
 
 %changelog
+* Tue Nov 15 2005 Peter Jones <pjones at redhat.com> - 0.4.4-2.5
+- unsplit kpartx.  parted knows how to do this now, so we don't
+  need this in a separate package.
+
 * Tue Nov 15 2005 Peter Jones <pjones at redhat.com> - 0.4.4-2.4
 - split kpartx out into its own package