rpms/desktop-data-model/devel desktop-data-model.spec,1.1,1.2

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/desktop-data-model/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10766

Modified Files:
	desktop-data-model.spec 
Log Message:
add requires and conflicts


Index: desktop-data-model.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-data-model/devel/desktop-data-model.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktop-data-model.spec	25 Feb 2008 23:22:58 -0000	1.1
+++ desktop-data-model.spec	27 Feb 2008 17:30:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           desktop-data-model
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Engine providing live updates of online data to the desktop
 
 Group:          System Environment/Libraries
@@ -9,6 +9,9 @@
 Source0:        http://download.gnome.org/sources/desktop-data-model/desktop-data-model-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Previously, libddm-1.so was shipped in the mugshot package
+Conflicts: mugshot < 1.1.90-1
+
 BuildRequires:  glib2-devel >= 2.6
 BuildRequires:  gtk2-devel >= 2.6
 BuildRequires:  loudmouth-devel >= 1.0.3-3
@@ -33,6 +36,9 @@
 Summary: Development headers for Online Desktop Data Model
 Group: Development/Languages
 Requires: pkgconfig
+Requires: desktop-data-model = %{version}-%{release}
+Conflicts: mugshot-devel < 1.1.90-1
+Obsoletes: mugshot-devel
 
 %description devel
 This package contains libraries for Online Desktop Data Model.
@@ -75,5 +81,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Feb 27 2008 Colin Walters <walters at redhat.com> - 1.2.0-2
+- Require desktop-data-model from -devel
+- Add conflicts: on earlier Mugshot versions since we both ship libddm-1.so
+
 * Tue Jan 29 2008 Colin Walters <walters at redhat.com> - 1.2.0-1
 - initial splat into spec