[empathy/f14/master] - Rebuild for new evo. - Fix the left over gonf bits for gsettings migration. - Drop buildroot, sinc

[Brian Pepple]

commit 3fdc31d7c0a28ad830bdd3cf0d31b69acf1fc979
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Tue Sep 14 19:55:48 2010 -0400

    - Rebuild for new evo.
    - Fix the left over gonf bits for gsettings migration.
    - Drop buildroot, since it's no longer needed.

 empathy.spec |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/empathy.spec b/empathy.spec
index 9f5846a..86fe125 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -12,7 +12,7 @@
 
 Name:		empathy
 Version:	2.31.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -22,8 +22,6 @@ URL:		http://live.gnome.org/Empathy
 Source0:	http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
 BuildRequires:	desktop-file-utils
@@ -60,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
@@ -116,26 +110,20 @@ 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,6 +152,11 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Tue Sep 14 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.31.90-2
+- Rebuild for new evo.
+- Fix the left over gonf bits for gsettings migration.
+- Drop buildroot, since it's no longer needed.
+
 * Wed Sep 01 2010 Bastien Nocera <bnocera at redhat.com> 2.31.90-1
 - Update to 2.31.90
 - Build against GTK+ 2.x