From 322bef7e1cd6d0ea6b7c0085d930720642fdfb67 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 4 Jun 2008 17:51:35 +0000
Subject: [PATCH] 2.23.1

---
 .cvsignore  |  2 +-
 GConf2.spec | 19 +++++--------------
 sources     |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 13b182b..5edbbf5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.22.0.tar.bz2
+GConf-2.23.1.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 69a4628..a183f3c 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -6,8 +6,8 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.22.0
-Release: 10%{?dist}
+Version: 2.23.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
@@ -37,14 +37,6 @@ Requires: /usr/bin/killall
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
 Patch1: GConf2-2.14.0-timeout.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=531063
-Patch2: gconf-timeouts.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=126468
-Patch3: gconf-no-syslog.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=525504
-Patch4: gconf-unset-mandatory.patch
-
-Patch5: gconf-2.22.0-use-dbus.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=531169
 Patch6: defaults.patch
@@ -85,10 +77,6 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .timers  
-%patch2 -p1 -b .timeouts
-%patch3 -p1 -b .no-syslog
-%patch4 -p0 -b .unset-mandatory
-%patch5 -p1 -b .use-dbus
 %patch6 -p1 -b .defaults
 %patch7 -p1 -b .fix-defaults
 
@@ -163,6 +151,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jun  4 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.1-1
+- Upodate to 2.23.1
+
 * Mon Jun  2 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-10
 - Make gconfd notice defaults changes
 
diff --git a/sources b/sources
index b1e027e..a4e5ac9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a56c043afeb1052abaf45407409b0331  GConf-2.22.0.tar.bz2
+f0dc9a77c005c9beedd58d70e08cc194  GConf-2.23.1.tar.bz2