From c9619423425cce6a4e47655ff5436a615cdfad74 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Nov 30 2009 17:39:07 +0000 Subject: - Update to 2.29.3. - Drop nautilus sendto plugin linking patch. Fixed upstream. - Drop broken NetworkManager patch. Fixed upstream. --- diff --git a/.cvsignore b/.cvsignore index ef0eefe..c163c26 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -empathy-2.29.2.tar.bz2 +empathy-2.29.3.tar.bz2 diff --git a/0001-Fix-nautilus-sendto-plugin-s-linking.patch b/0001-Fix-nautilus-sendto-plugin-s-linking.patch deleted file mode 100644 index 1d96446..0000000 --- a/0001-Fix-nautilus-sendto-plugin-s-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f44b8944627b2710de91be915bdc1207ef0eee01 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -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 - diff --git a/empathy-broken-nm.patch b/empathy-broken-nm.patch deleted file mode 100644 index 61d5f91..0000000 --- a/empathy-broken-nm.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -urp empathy-2.29.2.orig/configure empathy-2.29.2/configure ---- empathy-2.29.2.orig/configure 2009-11-16 11:56:32.000000000 -0500 -+++ empathy-2.29.2/configure 2009-11-16 18:01:53.977910996 -0500 -@@ -15604,16 +15604,16 @@ if test -n "$PKG_CONFIG"; then - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" -- libnm_glib >= \$NETWORK_MANAGER_REQUIRED -+ libnm-glib >= \$NETWORK_MANAGER_REQUIRED - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags " -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -15628,16 +15628,16 @@ if test -n "$PKG_CONFIG"; then - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" -- libnm_glib >= \$NETWORK_MANAGER_REQUIRED -+ libnm-glib >= \$NETWORK_MANAGER_REQUIRED - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs " -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -15658,11 +15658,11 @@ else - fi - if test $_pkg_short_errors_supported = yes; then - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - "` - else - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - "` - fi - # Put the nasty error message in config.log where it belongs -diff -urp empathy-2.29.2.orig/configure.ac empathy-2.29.2/configure.ac ---- empathy-2.29.2.orig/configure.ac 2009-11-16 11:55:52.000000000 -0500 -+++ empathy-2.29.2/configure.ac 2009-11-16 18:03:24.609913005 -0500 -@@ -227,7 +227,7 @@ else - - PKG_CHECK_MODULES(NETWORK_MANAGER, - [ -- libnm_glib >= $NETWORK_MANAGER_REQUIRED -+ libnm-glib >= $NETWORK_MANAGER_REQUIRED - ], have_nm="yes", have_nm="no") - - if test "x$have_nm" = "xyes"; then diff --git a/empathy.spec b/empathy.spec index 6fb20f0..a4705ae 100644 --- a/empathy.spec +++ b/empathy.spec @@ -6,13 +6,13 @@ %global enchant_version 1.2.0 %global network_manager_version 0.7.0 %global libcanberra_version 0.4 -%global webkit_version 1.1.7 +%global webkit_version 1.1.15 %global libnotify_version 0.4.4 %global libchamplain_version 0.4 Name: empathy -Version: 2.29.2 -Release: 2%{?dist} +Version: 2.29.3 +Release: 1%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -24,10 +24,6 @@ Source1: %{name}-README.ConnectionManagers # 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) @@ -92,9 +88,6 @@ It is built on top of the Telepathy framework. %prep %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 @@ -165,7 +158,6 @@ fi %doc AUTHORS COPYING README README.ConnectionManagers NEWS %{_sysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/empathy -%{_bindir}/empathy-logs %{_libdir}/nautilus-sendto/plugins/libnstempathy.so %{_datadir}/empathy/ %{_datadir}/applications/fedora-%{name}*.desktop @@ -176,6 +168,11 @@ fi %{_mandir}/man1/empathy*.1.gz %changelog +* Mon Nov 30 2009 Brian Pepple - 2.29.3-1 +- Update to 2.29.3. +- Drop nautilus sendto plugin linking patch. Fixed upstream. +- Drop broken NetworkManager patch. Fixed upstream. + * Wed Nov 18 2009 Bastien Nocera 2.29.2-2 - Rebuild with nautilus-sendto plugin diff --git a/sources b/sources index 52c97ee..96a6f4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ee738907d31549f2dadb2bead938d2b empathy-2.29.2.tar.bz2 +b2ea05a8382b4073a7a0a48b3db0078c empathy-2.29.3.tar.bz2