From 62a9e61076ac99f7b649bd02e423bbb63c16f549 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jan 08 2008 18:02:27 +0000
Subject: 2.21.1


---

diff --git a/.cvsignore b/.cvsignore
index cac563d..17de5c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-GConf-2.20.1.tar.bz2
+GConf-2.21.1.tar.bz2
diff --git a/GConf2.spec b/GConf2.spec
index 2464104..cf1ee75 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -4,8 +4,8 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.20.1
-Release: 4%{?dist}
+Version: 2.21.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.20/GConf-%{version}.tar.bz2
@@ -29,10 +29,6 @@ Requires: /usr/bin/killall
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=356573
 Patch1: GConf2-2.14.0-timeout.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=475970
-Patch2: sync-leak.patch 
-Patch3: dir-leak.patch 
-Patch4: dead-leak.patch 
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -69,9 +65,6 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .timers  
-%patch2 -p1 -b .sync-leak
-%patch3 -p1 -b .dir-leak
-%patch4 -p1 -b .dead-leak
 
 %build
 rm -f libtool
@@ -142,6 +135,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan  8 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.1-1
+- Update to 2.21.1
+- Drop upstreamed patches
+
 * Mon Dec  3 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-4
 - Rebuild against new openldap
 
diff --git a/dead-leak.patch b/dead-leak.patch
deleted file mode 100644
index 5470865..0000000
--- a/dead-leak.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up GConf-2.19.1/gconf/gconf-database.c.dead-leak GConf-2.19.1/gconf/gconf-database.c
---- GConf-2.19.1/gconf/gconf-database.c.dead-leak	2007-09-11 15:33:11.000000000 -0400
-+++ GConf-2.19.1/gconf/gconf-database.c	2007-09-11 15:32:42.000000000 -0400
-@@ -1259,6 +1259,8 @@ gconf_database_notify_listeners (GConfDa
-       tmp = g_slist_next(tmp);
-     }
- 
-+  g_slist_free (closure.dead);
-+
-   if (notify_others)
-     {
-       g_return_if_fail (modified_sources != NULL);
diff --git a/dir-leak.patch b/dir-leak.patch
deleted file mode 100644
index ded7374..0000000
--- a/dir-leak.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up GConf-2.19.1/backends/markup-tree.c.dir-leak GConf-2.19.1/backends/markup-tree.c
---- GConf-2.19.1/backends/markup-tree.c.dir-leak	2007-09-11 14:51:12.000000000 -0400
-+++ GConf-2.19.1/backends/markup-tree.c	2007-09-11 14:52:30.000000000 -0400
-@@ -263,6 +263,7 @@ markup_dir_free (MarkupDir *dir)
- 
-       tmp = tmp->next;
-     }
-+  g_slist_free (dir->entries);
- 
-   tmp = dir->subdirs;
-   while (tmp)
-@@ -273,6 +274,7 @@ markup_dir_free (MarkupDir *dir)
- 
-       tmp = tmp->next;
-     }
-+  g_slist_free (dir->subdirs);
- 
-   g_free (dir->name);
- 
diff --git a/sources b/sources
index 2434db9..4a4f89b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-646fc896c6282a8f103365af0fa2e303  GConf-2.20.1.tar.bz2
+b3c031822fc9e3fb49fa92c8f6f996c6  GConf-2.21.1.tar.bz2
diff --git a/sync-leak.patch b/sync-leak.patch
deleted file mode 100644
index 638991f..0000000
--- a/sync-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up GConf-2.19.1/backends/xml-cache.c.leaks GConf-2.19.1/backends/xml-cache.c
---- GConf-2.19.1/backends/xml-cache.c.leaks	2007-09-11 10:54:43.000000000 -0400
-+++ GConf-2.19.1/backends/xml-cache.c	2007-09-11 10:54:58.000000000 -0400
-@@ -272,6 +272,7 @@ cache_sync (Cache    *cache,
- 
-   /* sync it all */
-   g_slist_foreach (list, (GFunc) cache_sync_foreach, &sd);
-+  g_slist_free (list);
- 
-   /* If we deleted some subdirs, we may now be able to delete
-    * more parent dirs. So go ahead and do the sync again.