rpms/empathy/devel .cvsignore, 1.48, 1.49 DSOLinking.patch, 1.1, 1.2 empathy.spec, 1.94, 1.95 sources, 1.48, 1.49

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16436

Modified Files:
	.cvsignore DSOLinking.patch empathy.spec sources 
Log Message:
* Mon Feb 22 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.29.91-1
- Update to 2.29.91.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	8 Feb 2010 21:06:23 -0000	1.48
+++ .cvsignore	22 Feb 2010 15:51:45 -0000	1.49
@@ -1 +1 @@
-empathy-2.29.90.tar.bz2
+empathy-2.29.91.tar.bz2

DSOLinking.patch:
 Makefile.am  |    1 +
 Makefile.am~ |only
 Makefile.in  |    2 +-
 Makefile.in~ |only
 4 files changed, 2 insertions(+), 1 deletion(-)

Index: DSOLinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/DSOLinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- DSOLinking.patch	19 Feb 2010 15:49:42 -0000	1.1
+++ DSOLinking.patch	22 Feb 2010 15:51:45 -0000	1.2
@@ -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~


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- empathy.spec	21 Feb 2010 00:43:29 -0000	1.94
+++ empathy.spec	22 Feb 2010 15:51:45 -0000	1.95
@@ -11,8 +11,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.29.90
-Release:	3%{?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 --d
 	--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 at fedoraproject.org> - 2.29.91-1
+- Update to 2.29.91.
+
 * Sat Feb 20 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.29.90-3
 - Rebuild for new tp-mission-control.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	8 Feb 2010 21:06:23 -0000	1.48
+++ sources	22 Feb 2010 15:51:45 -0000	1.49
@@ -1 +1 @@
-666f33b21fc36b6ade1b9bb29f51d025  empathy-2.29.90.tar.bz2
+27b1ae1d58ddc054cf42e766bdd5f523  empathy-2.29.91.tar.bz2