From d5da8b28db55c67dc40b6a59bf10be7a40f84490 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Sep 02 2009 00:56:03 +0000 Subject: - Add patch to workaround NetworkManager pc file name change. --- diff --git a/empathy-broken-nm.patch b/empathy-broken-nm.patch new file mode 100644 index 0000000..d1cc73b --- /dev/null +++ b/empathy-broken-nm.patch @@ -0,0 +1,69 @@ +diff -urp empathy-2.27.91.1.OLD/configure empathy-2.27.91.1/configure +--- empathy-2.27.91.1.OLD/configure 2009-08-25 11:58:07.000000000 -0400 ++++ empathy-2.27.91.1/configure 2009-09-01 20:19:21.000104092 -0400 +@@ -18227,16 +18227,16 @@ if test -n "$PKG_CONFIG"; then + else + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 +@@ -18251,16 +18251,16 @@ if test -n "$PKG_CONFIG"; then + else + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$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:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; 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 +@@ -18281,11 +18281,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.27.91.1.OLD/configure.ac empathy-2.27.91.1/configure.ac +--- empathy-2.27.91.1.OLD/configure.ac 2009-08-25 11:46:02.000000000 -0400 ++++ empathy-2.27.91.1/configure.ac 2009-09-01 20:18:24.951104847 -0400 +@@ -183,7 +183,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 c0ce8c5..94678da 100644 --- a/empathy.spec +++ b/empathy.spec @@ -15,7 +15,7 @@ Name: empathy Version: 2.27.91.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Instant Messaging Client for GNOME Group: Applications/Communications @@ -36,6 +36,7 @@ Patch2: %{name}-desktop-category.patch Patch3: presence-icons.patch # http://bugzilla.gnome.org/show_bug.cgi?id=593318 Patch4: %{name}-fix-nav-handling.patch +Patch5: %{name}-broken-nm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: enchant-devel >= %{enchant_version} @@ -140,6 +141,7 @@ bindings to the libempathy and libempathy-gtk libraries, respectively. %patch2 -p1 -b .desktop %patch3 -p1 -b .presence-icons %patch4 -p1 -b .fix-nav-handling +%patch5 -p1 -b .nm # force these to be regenerated rm data/empathy.desktop @@ -248,6 +250,9 @@ fi %{python_sitearch}/empathy*.so %changelog +* Tue Sep 1 2009 Brian Pepple - 2.27.91.1-6 +- Add patch to workaround NetworkManager pc file name change. + * Sat Aug 29 2009 Brian Pepple - 2.27.91.1-5 - Backport patch to fix incorrect assumption about navigation-request. (#519849)