rpms/empathy/devel empathy-broken-nm.patch, NONE, 1.1 empathy.spec, 1.74, 1.75

[Brian Pepple]

Author: bpepple

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

Modified Files:
	empathy.spec 
Added Files:
	empathy-broken-nm.patch 
Log Message:
* Tue Sep  1 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-6
- Add patch to workaround NetworkManager pc file name change.


empathy-broken-nm.patch:
 configure    |   16 ++++++++--------
 configure.ac |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE empathy-broken-nm.patch ---
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


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- empathy.spec	29 Aug 2009 20:54:04 -0000	1.74
+++ empathy.spec	2 Sep 2009 00:56:03 -0000	1.75
@@ -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 libempath
 %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 <bpepple at fedoraproject.org> - 2.27.91.1-6
+- Add patch to workaround NetworkManager pc file name change.
+
 * Sat Aug 29 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.91.1-5
 - Backport patch to fix incorrect assumption about navigation-request. (#519849)