[empathy] Update to 3.1.1. Enable maps again. Drop obsoletes/provides. They should no longer be needed. Bump m

[Brian Pepple]

commit 3426b579c45af3072bc9bc497516ee00968dffea
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon May 9 18:04:05 2011 -0400

    Update to 3.1.1.
    Enable maps again.
    Drop obsoletes/provides. They should no longer be needed.
    Bump minimum version of tp-glib.

 .gitignore   |    1 +
 empathy.spec |   24 +++++++++++-------------
 sources      |    2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f3b4fd..2937eea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ empathy-2.31.5.1.tar.bz2
 /empathy-2.91.93.tar.bz2
 /empathy-3.0.0.tar.bz2
 /empathy-3.0.1.tar.bz2
+/empathy-3.1.1.tar.bz2
diff --git a/empathy.spec b/empathy.spec
index e9c46db..8868649 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -2,7 +2,7 @@
 %global	gtk3_min_version	3.0.2
 %global	glib2_min_version	2.27.2
 %global	tp_mc_min_version	5.0.0
-%global	tp_glib_min_version	0.14.1
+%global	tp_glib_min_version	0.14.3
 %global	enchant_version		1.2.0
 %global network_manager_version 0.7.0
 %global libcanberra_version     0.4
@@ -12,8 +12,8 @@
 %global folks_version           0.4.0
 
 Name:		empathy
-Version:	3.0.1
-Release:	4%{?dist}
+Version:	3.1.1
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -42,7 +42,7 @@ 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:	nautilus-sendto-devel
@@ -62,14 +62,6 @@ Requires:	telepathy-haze
 Requires(post): /usr/bin/gtk-update-icon-cache
 Requires(postun): /usr/bin/gtk-update-icon-cache
 
-## Devel, libs, and python subpackages have been removed.  These can be dropped around F15.
-Obsoletes:	%{name}-devel < 2.29.2-1
-Provides:	%{name}-devel = %{version}-%{release}
-Obsoletes:	%{name}-libs < 2.29.2-1
-Provides:	%{name}-libs = %{version}-%{release}
-Obsoletes:	%{name}-python < 2.29.2-1
-Provides:	%{name}-python = %{version}-%{release}
-
 
 %description
 Empathy is powerful multi-protocol instant messaging client which
@@ -86,7 +78,7 @@ rm data/empathy.desktop
 %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=no
+%configure --disable-static --enable-map=yes
 ## 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
@@ -156,6 +148,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Mon May  9 2011 Brian Pepple <bpepple at fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1.
+- Enable maps again.
+- Drop obsoletes/provides. They should no longer be needed.
+- Bump minimum version of tp-glib.
+
 * Fri May 06 2011 Brian Pepple <bpepple at fedoraproject.org> - 3.0.1-4
 - Rebuild for new tp-logger
 
diff --git a/sources b/sources
index 3c5c9de..a281420 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53fcf122059f9ef5d944083fc0c7fd23  empathy-3.0.1.tar.bz2
+c85c8c367ac335891efab8147b636ea0  empathy-3.1.1.tar.bz2