From 249115131127e4d0dba6ad55256676388454da05 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Dec 30 2008 01:10:05 +0000 Subject: - Add patch to work around our broken pkgconfig. --- diff --git a/empathy-broken-pkgconfig.patch b/empathy-broken-pkgconfig.patch new file mode 100644 index 0000000..03a5193 --- /dev/null +++ b/empathy-broken-pkgconfig.patch @@ -0,0 +1,26 @@ +diff -urp empathy-2.25.3.OLD/libempathy/libempathy.pc.in empathy-2.25.3/libempathy/libempathy.pc.in +--- empathy-2.25.3.OLD/libempathy/libempathy.pc.in 2008-12-12 13:41:01.000000000 -0500 ++++ empathy-2.25.3/libempathy/libempathy.pc.in 2008-12-29 19:58:24.000000000 -0500 +@@ -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, gio-2.0, gio-unix-2.0, telepathy-glib ++Requires: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol, gio-2.0, gio-unix-2.0, telepathy-glib + Version: @VERSION@ + Libs: -L${libdir} -lempathy + Cflags: -I${includedir} +diff -urp empathy-2.25.3.OLD/libempathy-gtk/libempathy-gtk.pc.in empathy-2.25.3/libempathy-gtk/libempathy-gtk.pc.in +--- empathy-2.25.3.OLD/libempathy-gtk/libempathy-gtk.pc.in 2008-12-12 13:41:01.000000000 -0500 ++++ empathy-2.25.3/libempathy-gtk/libempathy-gtk.pc.in 2008-12-29 19:57:54.000000000 -0500 +@@ -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, libglade-2.0, libmissioncontrol, libempathy, telepathy-glib ++Requires: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libmissioncontrol, libempathy, telepathy-glib + Version: @VERSION@ + Libs: -L${libdir} -lempathy-gtk + Cflags: -I${includedir} diff --git a/empathy.spec b/empathy.spec index 642563d..3e186dc 100644 --- a/empathy.spec +++ b/empathy.spec @@ -10,7 +10,7 @@ Name: empathy Version: 2.25.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -22,6 +22,9 @@ Source1: %{name}-README.ConnectionManagers ## Fedora-specific, to automagically transition the profile names. (#459282) Patch0: %{name}-fedora-mission-control-convert.patch +## Workaround for our broken pkgconfig +## https://bugzilla.redhat.com/show_bug.cgi?id=436773 +Patch1: %{name}-broken-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -120,7 +123,7 @@ bindings to the libempathy and libempathy-gtk libraries, respectively. %prep %setup -q %patch0 -p1 -b .profile-update - +%patch1 -p1 -b .pkgconfig %build ## GCC complains about some unused functions, so we forcibly show those as @@ -224,6 +227,9 @@ fi %{python_sitearch}/empathy*.so %changelog +* Mon Dec 29 2008 Brian Pepple - 2.25.3-4 +- Add patch to work around our broken pkgconfig. + * Mon Dec 29 2008 Brian Pepple - 2.25.3-3 - Rebuild.