rpms/empathy/devel 0001-Fix-nautilus-sendto-plugin-s-linking.patch, NONE, 1.1 empathy.spec, 1.84, 1.85

[Bastien Nocera]

Author: hadess

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

Modified Files:
	empathy.spec 
Added Files:
	0001-Fix-nautilus-sendto-plugin-s-linking.patch 
Log Message:
fix nst plugin linking

0001-Fix-nautilus-sendto-plugin-s-linking.patch:
 Makefile.am |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE 0001-Fix-nautilus-sendto-plugin-s-linking.patch ---
>From f44b8944627b2710de91be915bdc1207ef0eee01 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Wed, 18 Nov 2009 17:06:34 +0000
Subject: [PATCH] Fix nautilus-sendto plugin's linking

No need to link to both libempathy-gtk and libempathy, the former
already links to the latter.

https://bugzilla.gnome.org/show_bug.cgi?id=602324
---
 nautilus-sendto-plugin/Makefile.am |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index dc0c744..8fc5c1e 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -14,6 +14,5 @@ libnstempathy_la_SOURCES = empathy-nautilus-sendto.c
 libnstempathy_la_LDFLAGS = -module -avoid-version
 libnstempathy_la_LIBADD =				\
 	$(NST_LIBS)					\
-	$(top_builddir)/libempathy/libempathy.la	\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
 
-- 
1.6.5.2



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- empathy.spec	18 Nov 2009 02:08:24 -0000	1.84
+++ empathy.spec	18 Nov 2009 17:10:42 -0000	1.85
@@ -25,6 +25,9 @@ Source1:	%{name}-README.ConnectionManage
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch1:		presence-icons.patch
 Patch2:		%{name}-broken-nm.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=602324
+BuildRequires:	automake autoconf libtool
+Patch3:		0001-Fix-nautilus-sendto-plugin-s-linking.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,7 +93,8 @@ It is built on top of the Telepathy fram
 %setup -q
 %patch1 -p1 -b .presence-icons
 %patch2 -p1 -b .nm
-
+%patch3 -p1 -b .nst
+automake
 # force these to be regenerated
 rm data/empathy.desktop
 rm data/empathy.schemas