rpms/gnome-phone-manager/devel gpm-telepathy-workaround.patch, 1.2, 1.3 gnome-phone-manager.spec, 1.21, 1.22

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Fri Mar 21 15:17:21 UTC 2008


Author: hadess

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

Modified Files:
	gnome-phone-manager.spec 
Added Files:
	gpm-telepathy-workaround.patch 
Log Message:
Telepathy-glib-devel bug isn't fixed, revive and update patch


gpm-telepathy-workaround.patch:

Index: gpm-telepathy-workaround.patch
===================================================================
RCS file: gpm-telepathy-workaround.patch
diff -N gpm-telepathy-workaround.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gpm-telepathy-workaround.patch	21 Mar 2008 15:17:07 -0000	1.3
@@ -0,0 +1,46 @@
+--- gnome-phone-manager-0.51/configure.old	2008-03-21 15:13:14.000000000 +0000
++++ gnome-phone-manager-0.51/configure	2008-03-21 15:15:10.000000000 +0000
+@@ -22938,12 +22938,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
+@@ -22956,12 +22956,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
+@@ -22980,9 +22980,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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-phone-manager.spec	21 Mar 2008 14:52:33 -0000	1.21
+++ gnome-phone-manager.spec	21 Mar 2008 15:17:07 -0000	1.22
@@ -24,6 +24,9 @@
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=436773
+Patch0:		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.
@@ -45,6 +48,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 %configure




More information about the fedora-extras-commits mailing list