rpms/empathy/devel empathy-broken-pkgconfig.patch, 1.4, 1.5 empathy.spec, 1.70, 1.71

[Brian Pepple]

Author: bpepple

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

Modified Files:
	empathy-broken-pkgconfig.patch empathy.spec 
Log Message:
* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-2
- Update broken pkgconfig patch to not include libmissioncontrol.
- Drop BR on telepathy-mission-control-devel. mc is a runtime dep.


empathy-broken-pkgconfig.patch:
 libempathy-gtk/libempathy-gtk.pc.in |    3 +--
 libempathy/libempathy.pc.in         |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Index: empathy-broken-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-broken-pkgconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- empathy-broken-pkgconfig.patch	31 May 2009 05:05:50 -0000	1.4
+++ empathy-broken-pkgconfig.patch	26 Aug 2009 22:10:42 -0000	1.5
@@ -1,14 +1,26 @@
-diff -up ./libempathy-gtk/libempathy-gtk.pc.in.old ./libempathy-gtk/libempathy-gtk.pc.in
---- ./libempathy-gtk/libempathy-gtk.pc.in.old	2009-05-30 18:08:26.669287439 -0700
-+++ ./libempathy-gtk/libempathy-gtk.pc.in	2009-05-30 18:09:05.628230924 -0700
+diff -urp empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in empathy-2.27.91.1/libempathy/libempathy.pc.in
+--- empathy-2.27.91.1.OLD/libempathy/libempathy.pc.in	2009-05-18 05:58:49.000000000 -0400
++++ empathy-2.27.91.1/libempathy/libempathy.pc.in	2009-08-26 16:59:16.000000000 -0400
+@@ -5,8 +5,7 @@ includedir=@includedir@
+ 
+ Name: libempathy
+ Description:  Empathy base library
+-Requires: pkg-config >= 0.21
+-Requires.private: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, \
++Requires: glib-2.0, gobject-2.0, libxml-2.0, \
+                   gio-2.0, gio-unix-2.0, telepathy-glib
+ Version: @VERSION@
+ Libs: -L${libdir} -lempathy
+diff -urp empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in
+--- empathy-2.27.91.1.OLD/libempathy-gtk/libempathy-gtk.pc.in	2009-05-18 06:14:46.000000000 -0400
++++ empathy-2.27.91.1/libempathy-gtk/libempathy-gtk.pc.in	2009-08-26 16:59:39.000000000 -0400
 @@ -5,8 +5,7 @@ includedir=@includedir@
  
  Name: libempathy-gtk
  Description:  Empathy interface library
 -Requires: pkg-config >= 0.21
 -Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libmissioncontrol, \
-+Requires: glib-2.0, gobject-2.0, gtk+-2.0, libmissioncontrol, \
++Requires: glib-2.0, gobject-2.0, gtk+-2.0, \
                    libempathy, telepathy-glib, libcanberra-gtk
  Version: @VERSION@
  Libs: -L${libdir} -lempathy-gtk
-diff -up ./libempathy/libempathy.pc.in.old ./libempathy/libempathy.pc.in


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- empathy.spec	26 Aug 2009 18:39:49 -0000	1.70
+++ empathy.spec	26 Aug 2009 22:10:42 -0000	1.71
@@ -15,7 +15,7 @@
 
 Name:		empathy
 Version:	2.27.91.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -28,6 +28,8 @@ Source1:	%{name}-README.ConnectionManage
 ## Workaround for our broken pkgconfig
 ##  https://bugzilla.redhat.com/show_bug.cgi?id=436773
 ##  http://bugzilla.gnome.org/show_bug.cgi?id=577863
+## Removes old mission-control lookup
+## http://bugzilla.gnome.org/show_bug.cgi?id=593224
 Patch1:		%{name}-broken-pkgconfig.patch
 Patch2:		%{name}-desktop-category.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
@@ -52,7 +54,6 @@ BuildRequires:	libxml2-devel
 BuildRequires:	pygtk2-devel
 BuildRequires:	scrollkeeper
 BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
-BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
@@ -75,7 +76,7 @@ Requires:	telepathy-salut
 ## and I'd hate for people to simply disregard it for lack of the "out of the
 ## box" protocol support that Pidgin has. (RHBZ: 458935)
 Requires:	telepathy-haze
-Requires:	telepathy-mission-control
+Requires:	telepathy-mission-control >= %{tp_mc_min_version}
 
 Requires(pre):	GConf2
 
@@ -246,6 +247,10 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-2
+- Update broken pkgconfig patch to not include libmissioncontrol.
+- Drop BR on telepathy-mission-control-devel. mc is a runtime dep.
+
 * Wed Aug 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-1
 - Update to 2.27.91.1.
 - Add BR on unique-devel.