rpms/GConf2/devel GConf2.spec,1.100,1.101

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27022

Modified Files:
	GConf2.spec 
Log Message:
* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.26.0-2
- Explicit Conflicts: GConf2-dbus (#492636)



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- GConf2.spec	17 Mar 2009 03:53:55 -0000	1.100
+++ GConf2.spec	13 Apr 2009 19:33:10 -0000	1.101
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.25/GConf-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 Requires: dbus
 # for patch0
 Requires: /usr/bin/killall
+Conflicts: GConf2-dbus
 
 Patch0: GConf-2.18.0.1-reload.patch
 Patch1: gconf-less-work.patch
@@ -50,7 +51,7 @@
 Requires: pkgconfig
 # we install an automake macro
 Requires: automake
-
+Conflicts: GConf2-dbus-devel
 
 %description devel
 GConf development package. Contains files needed for doing
@@ -143,6 +144,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 2.26.0-2
+- Explicit Conflicts: GConf2-dbus (#492636)
+
 * Mon Mar 16 2009 Ray Strode <rstrode at redhat.com> - 2.26.0-1
 - update to 2.26.0