[empathy] - Update to 2.31.92. - Clean up gconf->gsetting conversion.

[Brian Pepple]

commit ab48c24b842f1a988c244644556335fd62bad9d2
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Tue Sep 14 19:13:26 2010 -0400

    - Update to 2.31.92.
    - Clean up gconf->gsetting conversion.

 .gitignore   |    1 +
 empathy.spec |   32 ++++++++++++--------------------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df8a4cc..ac2877e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 empathy-2.31.5.1.tar.bz2
 /empathy-2.31.90.tar.bz2
 /empathy-2.31.91.1.tar.bz2
+/empathy-2.31.92.tar.bz2
diff --git a/empathy.spec b/empathy.spec
index 3627e38..67fe673 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -2,7 +2,7 @@
 %global	gtk2_min_version	2.21.2
 %global	glib2_min_version	2.25.9
 %global	tp_mc_min_version	5.0.0
-%global	tp_glib_min_version	0.11.13
+%global	tp_glib_min_version	0.11.15
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
 %global libcanberra_version     0.4
@@ -11,7 +11,7 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.31.91.1
+Version:	2.31.92
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -58,10 +58,6 @@ Requires:	telepathy-idle
 Requires:	telepathy-butterfly
 Requires:	telepathy-haze
 
-Requires(pre):	GConf2
-Requires(post):	GConf2
-Requires(preun):	GConf2
-
 ## Profiles are no longer used, so we can drop this around F14.
 Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
 Provides:	telepathy-haze-mission-control = 0.2.0-3
@@ -114,26 +110,19 @@ desktop-file-install --vendor fedora --delete-original	\
 	%{buildroot}%{_datadir}/applications/%{name}-accounts.desktop
 
 
-%pre
-%gconf_schema_prepare %{name}
-
-
 %post
-%gconf_schema_upgrade %{name}
 touch --no-create %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 
 
-%preun
-%gconf_schema_remove %{name}
-
-
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ]; then
+   touch --no-create %{_datadir}/icons/hicolor || :
+   if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+   fi
+   glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 fi
-glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
@@ -164,8 +153,11 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %{_libexecdir}/empathy-auth-client
 
 
-
 %changelog
+* Tue Sep 14 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.92-1
+- Update to 2.31.92.
+- Clean up gconf->gsetting conversion.
+
 * Thu Sep  2 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.91.1-1
 - Update to 2.31.91.1.
 
diff --git a/sources b/sources
index 4c217a3..7d216d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17298d833ffa82662c4f5e7f8c743933  empathy-2.31.91.1.tar.bz2
+2442067975b32da54557f761c3e2b8e8  empathy-2.31.92.tar.bz2