[GConf2] Update to 3.1.3

[Ray Strode]

commit 3cd932d08a02bf4f2b60f23214fd362b2deb962e
Author: Ray Strode <rstrode at redhat.com>
Date:   Fri Jul 1 12:18:07 2011 -0400

    Update to 3.1.3

 .gitignore                                         |    1 +
 ...faults-mechanism-find-the-right-polkit-ac.patch |   47 -
 ...ve-worse-than-useless-signal-handlers-for.patch |   97 --
 GConf-2.18.0.1-reload.patch                        |   11 -
 GConf-gettext.patch                                |  360 ------
 GConf-settings-migration.patch                     |   35 -
 GConf2-2.14.0-timeout.patch                        |   32 -
 GConf2.spec                                        |   18 +-
 gconf-less-work.patch                              |   82 --
 gsettings-data-convert-realloc.patch               |   22 -
 no-access-crash.patch                              |   49 -
 polkit1.patch                                      | 1340 --------------------
 sources                                            |    2 +-
 13 files changed, 10 insertions(+), 2086 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fab05d7..e8c588d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ GConf-2.31.7.tar.bz2
 /GConf-2.32.2.tar.bz2
 /GConf-2.32.3.tar.bz2
 /GConf-2.32.4.tar.xz
+/GConf-3.1.3.tar.xz
diff --git a/GConf2.spec b/GConf2.spec
index 9c1103e..d6006f0 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -6,18 +6,17 @@
 
 Summary: A process-transparent configuration system
 Name: GConf2
-Version: 2.32.4
+Version: 3.1.3
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 #VCS: git:git://git.gnome.org/gconf
-Source0: http://download.gnome.org/sources/GConf/2.32/GConf-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/GConf/3.1/GConf-%{version}.tar.xz
 Source1: macros.gconf2
 URL: http://projects.gnome.org/gconf/
 
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: libxslt-devel
-BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 0.9
@@ -34,10 +33,6 @@ Requires: dbus
 Requires: /usr/bin/killall
 Conflicts: GConf2-dbus
 
-Patch0: GConf-2.18.0.1-reload.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=568845
-Patch1: GConf-gettext.patch
-
 %description
 GConf is a process-transparent configuration database API used to
 store user preferences. It has pluggable backends and features to
@@ -71,11 +66,9 @@ which require GTK+.
 
 %prep
 %setup -q -n GConf-%{version}
-%patch0 -p1 -b .reload
-%patch1 -p1 -b .gettext
 
 %build
-%configure --disable-static --enable-defaults-service --with-gtk=3.0
+%configure --disable-static --enable-defaults-service --disable-orbit --with-gtk=3.0
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -166,6 +159,11 @@ fi
 %doc %{_mandir}/man1/gsettings-schema-convert.1*
 
 %changelog
+* Fri Jul 01 2011 Ray Strode <rstrode at redhat.com> 3.1.3-1
+- Update to 3.1.3
+- Remove orbit dependency
+- drop unupstreamed patches judiciously
+
 * Fri Jun 17 2011 Tomas Bzatek <tbzatek at redhat.com> - 2.32.4-1
 - Update to 2.32.4
 
diff --git a/sources b/sources
index 9914ed2..a9e2398 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-083db5086d4a5a469e0e3b77847d9d8e  GConf-2.32.4.tar.xz
+f2d05e94704c1dcfb4a9a158b86f07a6  GConf-3.1.3.tar.xz