rpms/gnome-phone-manager/devel gpm-telepathy-workaround.patch, NONE, 1.1 gnome-phone-manager.spec, 1.16, 1.17

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-phone-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21793

Modified Files:
	gnome-phone-manager.spec 
Added Files:
	gpm-telepathy-workaround.patch 
Log Message:
* Mon Mar 10 2008 - Bastien Nocera <bnocera at redhat.com> - 0.50-2
- Work-around for telepathy brokeness


gpm-telepathy-workaround.patch:

--- NEW FILE gpm-telepathy-workaround.patch ---
--- configure.orig	2008-03-10 12:43:16.000000000 +0000
+++ configure	2008-03-10 12:43:26.000000000 +0000
@@ -22928,12 +22928,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"telepathy-glib\"") >&5
-  ($PKG_CONFIG --exists --print-errors "telepathy-glib") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 dbus-glib-1 telepathy-glib\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 dbus-glib-1 telepathy-glib") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib" 2>/dev/null`
+  pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 dbus-glib-1 telepathy-glib" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22946,12 +22946,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"telepathy-glib\"") >&5
-  ($PKG_CONFIG --exists --print-errors "telepathy-glib") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 dbus-glib-1 telepathy-glib\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 dbus-glib-1 telepathy-glib") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib" 2>/dev/null`
+  pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs "glib-2.0 dbus-glib-1 telepathy-glib" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22970,9 +22970,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "telepathy-glib"`
+	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 dbus-glib-1 telepathy-glib"`
         else
-	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "telepathy-glib"`
+	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 dbus-glib-1 telepathy-glib"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$TELEPATHY_PKG_ERRORS" >&5


Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-phone-manager.spec	10 Mar 2008 12:27:51 -0000	1.16
+++ gnome-phone-manager.spec	10 Mar 2008 12:49:05 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		gnome-phone-manager
 Summary:	Gnome Phone Manager
 Version: 	0.50
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPLv2+
 Group: 		Applications/System
 Source:		http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/%{version}/%{name}-%{version}.tar.bz2
@@ -23,6 +23,9 @@
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=436773
+Patch1:		gpm-telepathy-workaround.patch
+
 %description
 This program will connect to your mobile phone over a serial port,
 either via a cable, infrared (IrDA) or Bluetooth connection.
@@ -44,6 +47,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .telepathy-cflags
 
 %build
 %configure
@@ -104,6 +108,9 @@
 %{_datadir}/mission-control/profiles/*
 
 %changelog
+* Mon Mar 10 2008 - Bastien Nocera <bnocera at redhat.com> - 0.50-2
+- Work-around for telepathy brokeness
+
 * Mon Mar 10 2008 - Bastien Nocera <bnocera at redhat.com> - 0.50-1
 - Update to 0.50