rpms/dmraid/devel dmraid.spec,1.104,1.105

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26048

Modified Files:
	dmraid.spec 
Log Message:
* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-2
- Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
- Make -devel Require the main package now the dmraid-libs package is gone



Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- dmraid.spec	17 Sep 2009 16:31:34 -0000	1.104
+++ dmraid.spec	21 Sep 2009 14:26:39 -0000	1.105
@@ -7,11 +7,11 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: device-mapper-devel >= 1.02.02-2
 BuildRequires: device-mapper-event-devel
 BuildRequires: libselinux-devel
@@ -19,8 +19,8 @@ BuildRequires: libsepol-devel
 Requires: device-mapper >= 1.02.02-2
 Requires: dmraid-events
 Requires: kpartx
-Requires(postun): ldconfig
-Requires(post): ldconfig
+Obsoletes: dmraid-libs < %{version}-%{release}
+Provides: dmraid-libs = %{version}-%{release}
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
@@ -33,7 +33,7 @@ Linux >= 2.4 using device-mapper.
 %package -n dmraid-devel
 Summary: Development libraries and headers for dmraid.
 Group: Development/Libraries
-License: GPLv2+
+Requires: dmraid = %{version}-%{release}, sgpio
 
 %description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
@@ -130,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /etc/logwatch/scripts/services/dmeventd_syslogpattern.txt
 
 %changelog
+* Mon Sep 21 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc16-2
+- Add Obsoletes for dmraid-libs packages (merged into the main pkg, #524261)
+- Make -devel Require the main package now the dmraid-libs package is gone
+
 * Wed Sep 16 2009 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc16
 - Update to version 1.0.0.rc16