From bf2c662b775e655e4ebbc3ab74726ed67cbc99b9 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Apr 13 2009 19:33:10 +0000
Subject: - Explicit Conflicts: GConf2-dbus (#492636)


---

diff --git a/GConf2.spec b/GConf2.spec
index 4c8b07b..2ae23c9 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -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 @@ BuildRequires: dbus-glib-devel >= 0.8
 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: glib2-devel >= %{glib2_version}
 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 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax@redhat.com> 2.26.0-2
+- Explicit Conflicts: GConf2-dbus (#492636)
+
 * Mon Mar 16 2009 Ray Strode <rstrode@redhat.com> - 2.26.0-1
 - update to 2.26.0