From 18e803f2369ae55d857e6b9acee1a9a483a7775f Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@fedoraproject.org>
Date: Wed, 19 Jan 2005 12:32:53 +0000
Subject: [PATCH] - Backport some fixes from upstream CVS

---
 GConf2.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/GConf2.spec b/GConf2.spec
index 48d4cd8..6ca1788 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.8.1
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -22,6 +22,8 @@ BuildRequires: gtk-doc >= 0.9
 BuildRequires: pkgconfig >= 0.14
 BuildRequires: gettext
 
+Patch1: GConf2-2.8.1-cvs-backports.patch
+
 %description
 GConf is a process-transparent configuration database API used to 
 store user preferences. It has pluggable backends and features to 
@@ -42,6 +44,8 @@ development using GConf.
 %prep
 %setup -q -n GConf-%{version}
 
+%patch1 -p1 -b .cvs-backports
+
 %build
 %configure --disable-gtk-doc
 make
@@ -93,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jan 19 2005 Mark McLoughlin <markmc@redhat.com> 2.8.1-2
+- Backport some fixes from upstream CVS
+
 * Tue Oct 12 2004 Mark McLoughlin <markmc@redhat.com> 2.8.1-1
 - Update to 2.8.1