From 73e39ec487d262d1ff76ef2404cb2349ae2e861b Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Feb 22 2010 17:23:37 +0000
Subject: - Update to 2.29.91.


---

diff --git a/.cvsignore b/.cvsignore
index 3259a1b..f339cd9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-empathy-2.29.90.tar.bz2
+empathy-2.29.91.tar.bz2
diff --git a/DSOLinking.patch b/DSOLinking.patch
index 6707df6..7178d6e 100644
--- a/DSOLinking.patch
+++ b/DSOLinking.patch
@@ -1,15 +1,19 @@
---- empathy-2.29.90.orig/src/Makefile.am	2010-02-08 18:39:51.000000000 +0530
-+++ empathy-2.29.90.orig/src/Makefile.am	2010-02-19 22:24:34.617832209 +0530
-@@ -1,5 +1,5 @@ 
- include $(top_srcdir)/tools/flymake.mk
--
+diff -urp empathy-2.29.91.OLD/src/Makefile.am empathy-2.29.91/src/Makefile.am
+--- empathy-2.29.91.OLD/src/Makefile.am	2010-02-22 04:29:04.000000000 -0500
++++ empathy-2.29.91/src/Makefile.am	2010-02-22 10:05:14.081909190 -0500
+@@ -10,6 +10,7 @@ CPPFLAGS_COMMON =					\
+ 	$(WARN_CFLAGS)					\
+ 	$(NULL)
+ 
 +AM_LDFLAGS = -lm
  AM_CPPFLAGS =						\
- 	$(ERROR_CFLAGS)					\
- 	-I$(top_srcdir)                          	\
---- empathy-2.29.90.orig/src/Makefile.in	2010-02-09 01:50:18.000000000 +0530
-+++ empathy-2.29.90.orig/src/Makefile.in	2010-02-19 22:22:29.532814515 +0530
-@@ -254,7 +254,7 @@ 
+ 	$(CPPFLAGS_COMMON)				\
+ 	$(LIBNOTIFY_CFLAGS)				\
+Only in empathy-2.29.91/src: Makefile.am~
+diff -urp empathy-2.29.91.OLD/src/Makefile.in empathy-2.29.91/src/Makefile.in
+--- empathy-2.29.91.OLD/src/Makefile.in	2010-02-22 09:47:34.000000000 -0500
++++ empathy-2.29.91/src/Makefile.in	2010-02-22 10:06:08.945910974 -0500
+@@ -288,7 +288,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@
  INTLTOOL_PERL = @INTLTOOL_PERL@
  INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
  LD = @LD@
@@ -18,3 +22,4 @@
  LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@
  LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@
  LIBEMPATHYGTK_CFLAGS = @LIBEMPATHYGTK_CFLAGS@
+Only in empathy-2.29.91/src: Makefile.in~
diff --git a/empathy.spec b/empathy.spec
index a816956..ecd20dc 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -11,8 +11,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.29.90
-Release:	2%{?dist}
+Version:	2.29.91
+Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -118,6 +118,10 @@ desktop-file-install --vendor fedora --delete-original	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
+desktop-file-install --vendor fedora --delete-original	\
+	--dir %{buildroot}%{_datadir}/applications	\
+	%{buildroot}%{_datadir}/applications/%{name}-accounts.desktop
+
 
 %clean
 rm -rf %{buildroot}
@@ -160,7 +164,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%{_bindir}/empathy
+%{_bindir}/%{name}
+%{_bindir}/%{name}-accounts
 %{_libdir}/nautilus-sendto/plugins/libnstempathy.so
 %{_datadir}/empathy/
 %{_datadir}/applications/fedora-%{name}*.desktop
@@ -171,6 +176,9 @@ fi
 %{_mandir}/man1/empathy*.1.gz
 
 %changelog
+* Mon Feb 22 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.29.91-1
+- Update to 2.29.91.
+
 * Fri Feb 19 2010 Brian Pepple <bpepple@fedoraproject.org> - 2.29.90-2
 - Add patch to fix DSOLinking. (#564975)
 
diff --git a/sources b/sources
index 44148bc..c0bd9e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-666f33b21fc36b6ade1b9bb29f51d025  empathy-2.29.90.tar.bz2
+27b1ae1d58ddc054cf42e766bdd5f523  empathy-2.29.91.tar.bz2