rpms/gnome-phone-manager/devel gnome-phone-manager.spec, 1.24, 1.25 gpm-telepathy-workaround.patch, 1.3, 1.4

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	gnome-phone-manager.spec gpm-telepathy-workaround.patch 
Log Message:
Update telepathy workaround



Index: gnome-phone-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gnome-phone-manager.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-phone-manager.spec	11 Jun 2008 12:48:03 -0000	1.24
+++ gnome-phone-manager.spec	11 Jun 2008 14:27:15 -0000	1.25
@@ -48,7 +48,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 
+%patch0 -p0
 
 %build
 %configure

gpm-telepathy-workaround.patch:

Index: gpm-telepathy-workaround.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-phone-manager/devel/gpm-telepathy-workaround.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpm-telepathy-workaround.patch	21 Mar 2008 15:17:07 -0000	1.3
+++ gpm-telepathy-workaround.patch	11 Jun 2008 14:27:15 -0000	1.4
@@ -1,9 +1,9 @@
---- 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" && \
+--- configure.old	2008-06-11 15:25:07.000000000 +0100
++++ configure	2008-06-11 15:25:53.000000000 +0100
+@@ -23061,12 +23061,12 @@ if test -n "$TELEPATHY_CFLAGS"; then
+     pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     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
@@ -16,10 +16,10 @@
  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" && \
+@@ -23077,12 +23077,12 @@ if test -n "$TELEPATHY_LIBS"; then
+     pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     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
@@ -32,15 +32,15 @@
  else
    pkg_failed=yes
  fi
-@@ -22980,9 +22980,9 @@ else
+@@ -23100,9 +23100,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"`
+-	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "telepathy-glib" 2>&1`
++	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 dbus-glib-1 telepathy-glib" 2>&1`
          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"`
+-	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --print-errors "telepathy-glib" 2>&1`
++	        TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 dbus-glib-1 telepathy-glib" 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$TELEPATHY_PKG_ERRORS" >&5