From 08d81333600ea93feb826a55ce97fcc6269daf75 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 02:31:56 +0000 Subject: [PATCH] auto-import changelog data from GConf2-2.6.0-7.src.rpm Fri Jul 02 2004 Mark McLoughlin 2.6.0-7 - Add patch to fix problem when using merged files. Mainly neccessary only to work will with GConf 2.8. --- GConf2.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/GConf2.spec b/GConf2.spec index e280a77..8dc708f 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -5,7 +5,7 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 2.6.0 -Release: 6 +Release: 7 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -30,6 +30,9 @@ 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 + %description GConf is a process-transparent configuration database API used to store user preferences. It has pluggable backends and features to @@ -55,7 +58,8 @@ 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 -p0 -b .dont-mkdir-in-client +%patch3 -p1 -b .dont-mkdir-in-client +%patch4 -p1 -b .merge-files-fix ## unpack pofiles ## tar zxf %{SOURCE2} @@ -114,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Fri Jul 2 2004 Mark McLoughlin 2.6.0-7 +- Add patch to fix problem when using merged files. Mainly + neccessary only to work will with GConf 2.8. + * Tue Jun 15 2004 Elliot Lee - rebuilt