From 7405002d0484aeca16bdf2bae23d9838d0973754 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 02:31:59 +0000
Subject: [PATCH] auto-import changelog data from GConf2-2.7.90-1.src.rpm Tue
 Aug 03 2004 Mark McLoughlin <markmc@redhat.com> 2.7.90-1 - Update to 2.7.90 -
 Add patch to disable merge files for now

---
 .cvsignore  |  2 +-
 GConf2.spec | 39 ++++++++++++---------------------------
 sources     |  2 +-
 3 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a1123e0..37b2d0f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.6.0.tar.bz2
+GConf-2.7.90.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 8dc708f..6db863a 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -4,17 +4,15 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.6.0
-Release: 7
+Version: 2.7.90
+Release: 1
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
-## Source2: GConf-pofiles.tar.gz
 BuildRoot: %{_tmppath}/GConf2-%{version}-root
 URL: http://www.gnome.org
 Prereq: /sbin/install-info
-# Bug #106283
-Requires: ORBit2 >= 2.8.0
+Requires: ORBit2 >= %{orbit2_version}
 
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: ORBit2-devel >= %{orbit2_version}
@@ -25,13 +23,8 @@ BuildRequires: pkgconfig >= 0.14
 BuildRequires: libtool, autoconf
 BuildRequires: gettext
 
-## Will all be in 2.6.1
-Patch1: GConf2-2.6.0-fix-local-defaults-path-position.patch
-Patch2: GConf2-2.6.0-handle-entry-with-only-a-schema-name.patch
-Patch3: GConf2-2.6.0-dont-mkdir-in-client.patch
-
-## In 2.6.3
-Patch4: GConf2-2.6.0-merge-files-fix.patch
+# Need to look into this further before enabling it
+Patch0: GConf2-2.7.90-disable-merge-files.patch
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -53,27 +46,15 @@ development using GConf.
 %prep
 %setup -q -n GConf-%{version}
 
-# work around glib-gettextize bug affecting tarball
-perl -pi -e 's/-lintl//g' aclocal.m4
-
-%patch1 -p1 -b .fix-local-defaults-path-position
-%patch2 -p1 -b .handle-entry-with-only-a-schema-name
-%patch3 -p1 -b .dont-mkdir-in-client
-%patch4 -p1 -b .merge-files-fix
-
-## unpack pofiles
-## tar zxf %{SOURCE2}
+%patch0 -p1 -b .disable-merge-files
 
 %build
-autoconf # needed for the aclocal.m4 hack above
 %configure --disable-gtk-doc
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool  ## %{?_smp_mflags}
+make
 
 %install
 rm -fr $RPM_BUILD_ROOT
-export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT
 
 chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.defaults
 chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.mandatory
@@ -118,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Aug  3 2004 Mark McLoughlin <markmc@redhat.com> 2.7.90-1
+- Update to 2.7.90
+- Add patch to disable merge files for now
+
 * Fri Jul  2 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-7
 - Add patch to fix problem when using merged files. Mainly
   neccessary only to work will with GConf 2.8.
diff --git a/sources b/sources
index 2aef26b..abee8f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-241ca25941e5bfa0f71725c30e17ab6e  GConf-2.6.0.tar.bz2
+7f190856d450d588f760fe946decf4c7  GConf-2.7.90.tar.bz2