From b9e437af33841f90f888214c7ae2bd0b520d40cb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sat, 10 Jan 2009 05:15:07 +0000
Subject: [PATCH] 2.25.0

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

diff --git a/.cvsignore b/.cvsignore
index 1d1b8fc..e4f50e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.24.0.tar.bz2
+GConf-2.25.0.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 91cb5c2..fc287b5 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -6,11 +6,11 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.24.0
-Release: 3%{?dist}
+Version: 2.25.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
-Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/GConf/2.25/GConf-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gconf/
 
@@ -71,6 +71,11 @@ which require GTK+.
 
 %build
 %configure --disable-static --enable-defaults-service
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
 make
 
 %install
@@ -137,6 +142,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jan 10 2009 Matthias Clasen  <mclasen@redhat.com> - 2.25.0-1
+- Update to 2.25.0
+
 * Tue Dec 16 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-3
 - Rebuild for pkg-config requires
 
diff --git a/sources b/sources
index 2ae436a..14674ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4971d96f5ba94fe4a69396267bd5afe8  GConf-2.24.0.tar.bz2
+a2bd8b4cea939e7d2c4d574c173777ff  GConf-2.25.0.tar.bz2