From 7c8cf15207a45a44a15f8bd9687a23ba1ce7980f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 21 Oct 2012 13:30:38 -0400
Subject: [PATCH] Fix a memory leak

---
 ...er_get_parent-don-t-leak-parent_name.patch | 27 +++++++++++++++++++
 dconf.spec                                    |  9 +++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 0001-dconf_rebuilder_get_parent-don-t-leak-parent_name.patch

diff --git a/0001-dconf_rebuilder_get_parent-don-t-leak-parent_name.patch b/0001-dconf_rebuilder_get_parent-don-t-leak-parent_name.patch
new file mode 100644
index 0000000..f87292e
--- /dev/null
+++ b/0001-dconf_rebuilder_get_parent-don-t-leak-parent_name.patch
@@ -0,0 +1,27 @@
+From f732fba794d380a6c70ce7f82c3326a484909fba Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sun, 21 Oct 2012 12:50:19 -0400
+Subject: [PATCH] dconf_rebuilder_get_parent: don't leak parent_name
+
+Leak introduced in facae6ffcd5b2935f9b708eecb1fd5aa7c8ddf86.
+Tracked down by Fabien Tassin in
+https://bugzilla.gnome.org/show_bug.cgi?id=686573
+---
+ service/dconf-rebuilder.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/service/dconf-rebuilder.c b/service/dconf-rebuilder.c
+index 3f170d6..2b79e18 100644
+--- a/service/dconf-rebuilder.c
++++ b/service/dconf-rebuilder.c
+@@ -57,6 +57,7 @@ dconf_rebuilder_get_parent (GHashTable  *table,
+       if (grandparent != NULL)
+         gvdb_item_set_parent (parent, grandparent);
+     }
++  g_free (parent_name);
+ 
+   return parent;
+ }
+-- 
+1.7.12.1
+
diff --git a/dconf.spec b/dconf.spec
index 894ef92..a6e64ce 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -3,7 +3,7 @@
 
 Name:           dconf
 Version:        0.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -21,6 +21,9 @@ BuildRequires:  gtk-doc
 
 Requires:       dbus
 
+# upstream fix
+Patch0: 0001-dconf_rebuilder_get_parent-don-t-leak-parent_name.patch
+
 %description
 dconf is a low-level configuration system. Its main purpose is to provide a
 backend to the GSettings API in GLib.
@@ -46,6 +49,7 @@ dconf-editor allows you to browse and modify dconf databases.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -104,7 +108,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/dconf-editor.png
 
 %changelog
-* Thu Sep 27 2012 Richard Hughes <hughsient@gmail.com> - 0.14.0-1
+* Sun Oct 21 2012 Matthias Clasen <mclasen@redhat.com> - 0.14.0-2
+- Fix a memory leak
 - Update to 0.14.0
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.13.4-2