From 551135a3e28cb6abab6fea09ccada722b90c02f5 Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Jul 09 2010 19:44:17 +0000
Subject: - Update to 2.31.4.

- Disable libchamplain support for now due to api change.
- Drop schemas regeneration since empathy uses gsettings now.
- Add BR on telepathy-logger-devel.

---

diff --git a/.cvsignore b/.cvsignore
index a55f8bd..1198990 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-empathy-2.31.3.tar.bz2
+empathy-2.31.4.tar.bz2
diff --git a/empathy.spec b/empathy.spec
index 1daeb08..e0ac58a 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -1,8 +1,8 @@
 ## Minimum required versions.
-%global	gtk2_min_version	2.20
-%global	glib2_min_version	2.22.0
+%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.6
+%global	tp_glib_min_version	0.11.7
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
 %global libcanberra_version     0.4
@@ -11,8 +11,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.31.3
-Release:	4%{?dist}
+Version:	2.31.4
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -43,11 +43,12 @@ BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
 BuildRequires:	gnome-keyring-devel
-BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
+#BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11
 BuildRequires:	unique-devel
 BuildRequires:	nautilus-sendto-devel
+BuildRequires:  telepathy-logger-devel >= 0.1.2
 
 Requires:	telepathy-filesystem
 Requires:	telepathy-mission-control >= %{tp_mc_min_version}
@@ -82,14 +83,13 @@ It is built on top of the Telepathy framework.
 
 %prep
 %setup -q
-# force these to be regenerated
+# force this to be regenerated
 rm data/empathy.desktop
-rm data/empathy.schemas
 
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
-%configure --disable-static --enable-map=yes --enable-location=yes --enable-tpl=no --enable-favourite-contacts=no
+%configure --disable-static
 ## RPATHs are yucky.
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -139,7 +139,7 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+#%{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_bindir}/%{name}
 %{_bindir}/%{name}-accounts
 %{_bindir}/%{name}-debugger
@@ -153,6 +153,12 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Fri Jul  9 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.31.4-1
+- Update to 2.31.4.
+- Disable libchamplain support for now due to api change.
+- Drop schemas regeneration since empathy uses gsettings now.
+- Add BR on telepathy-logger-devel.
+
 * Tue Jul  6 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.31.3-4
 - Rebuild for new libchamplain.
 
diff --git a/sources b/sources
index 610f383..8499382 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0d654567cf553f125ee2b4b7959ce0c  empathy-2.31.3.tar.bz2
+c4250f9bd7228082b7b588fc873c4522  empathy-2.31.4.tar.bz2