rpms/gnome-mag/devel gnome-mag-pixbuf-xlib.patch, 1.1, 1.2 gnome-mag.spec, 1.63, 1.64

Matthias Clasen mclasen at fedoraproject.org
Tue Mar 17 05:48:54 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-mag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21577

Modified Files:
	gnome-mag-pixbuf-xlib.patch gnome-mag.spec 
Log Message:
update patch


gnome-mag-pixbuf-xlib.patch:

Index: gnome-mag-pixbuf-xlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/gnome-mag-pixbuf-xlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-mag-pixbuf-xlib.patch	24 Nov 2008 02:00:48 -0000	1.1
+++ gnome-mag-pixbuf-xlib.patch	17 Mar 2009 05:48:53 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gnome-mag-0.15.4/configure.in.pixbuf-xlib gnome-mag-0.15.4/configure.in
---- gnome-mag-0.15.4/configure.in.pixbuf-xlib	2008-08-31 20:34:52.000000000 -0400
-+++ gnome-mag-0.15.4/configure.in	2008-11-23 20:44:31.000000000 -0500
+diff -up gnome-mag-0.15.5/configure.in.xlib gnome-mag-0.15.5/configure.in
+--- gnome-mag-0.15.5/configure.in.xlib	2009-03-17 01:46:59.181336331 -0400
++++ gnome-mag-0.15.5/configure.in	2009-03-17 01:47:09.212322819 -0400
 @@ -251,7 +251,6 @@ PKG_CHECK_MODULES(DEPS, [
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
@@ -17,10 +17,10 @@
  ])
  AC_SUBST(TEST_LIBS)
  AC_SUBST(TEST_CFLAGS)
-diff -up gnome-mag-0.15.4/configure.pixbuf-xlib gnome-mag-0.15.4/configure
---- gnome-mag-0.15.4/configure.pixbuf-xlib	2008-11-23 20:44:59.000000000 -0500
-+++ gnome-mag-0.15.4/configure	2008-11-23 20:45:30.000000000 -0500
-@@ -26498,7 +26498,6 @@ if test -n "$PKG_CONFIG"; then
+diff -up gnome-mag-0.15.5/configure.xlib gnome-mag-0.15.5/configure
+--- gnome-mag-0.15.5/configure.xlib	2009-03-17 01:47:17.888302014 -0400
++++ gnome-mag-0.15.5/configure	2009-03-17 01:48:07.008318398 -0400
+@@ -26598,7 +26598,6 @@ if test -n "$DEPS_CFLAGS"; then
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -28,7 +28,7 @@
  \"") >&5
    ($PKG_CONFIG --exists --print-errors "
  	libloginhelper-1.0	>= 1.5.2
-@@ -26507,7 +26506,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26607,7 +26606,6 @@ if test -n "$DEPS_CFLAGS"; then
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -36,7 +36,7 @@
  ") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -26519,7 +26517,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26619,7 +26617,6 @@ if test -n "$DEPS_CFLAGS"; then
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -44,7 +44,7 @@
  " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -26540,7 +26537,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26638,7 +26635,6 @@ if test -n "$DEPS_LIBS"; then
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -52,7 +52,7 @@
  \"") >&5
    ($PKG_CONFIG --exists --print-errors "
  	libloginhelper-1.0	>= 1.5.2
-@@ -26549,7 +26545,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26647,7 +26643,6 @@ if test -n "$DEPS_LIBS"; then
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -60,7 +60,7 @@
  ") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -26561,7 +26556,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26659,7 +26654,6 @@ if test -n "$DEPS_LIBS"; then
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -68,23 +68,23 @@
  " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -26588,7 +26582,6 @@ fi
+@@ -26685,7 +26679,6 @@ fi
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
 -	gdk-pixbuf-xlib-2.0	>= 2.1.0
- "`
+ " 2>&1`
          else
- 	        DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
-@@ -26598,7 +26591,6 @@ fi
+ 	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+@@ -26695,7 +26688,6 @@ fi
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
 -	gdk-pixbuf-xlib-2.0	>= 2.1.0
- "`
+ " 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
-@@ -26611,7 +26603,6 @@ fi
+@@ -26708,7 +26700,6 @@ fi
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -92,7 +92,7 @@
  ) were not met:
  
  $DEPS_PKG_ERRORS
-@@ -26630,7 +26621,6 @@ echo "$as_me: error: Package requirement
+@@ -26727,7 +26718,6 @@ echo "$as_me: error: Package requirement
  	glib-2.0		>= 2.11.1
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -100,7 +100,7 @@
  ) were not met:
  
  $DEPS_PKG_ERRORS
-@@ -26692,7 +26682,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26788,7 +26778,6 @@ if test -n "$TEST_CFLAGS"; then
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -108,7 +108,7 @@
  \"") >&5
    ($PKG_CONFIG --exists --print-errors "
  	libspi-1.0		>= 1.5.0
-@@ -26701,7 +26690,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26797,7 +26786,6 @@ if test -n "$TEST_CFLAGS"; then
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -116,7 +116,7 @@
  ") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -26713,7 +26701,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26809,7 +26797,6 @@ if test -n "$TEST_CFLAGS"; then
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -124,7 +124,7 @@
  " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -26734,7 +26721,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26828,7 +26815,6 @@ if test -n "$TEST_LIBS"; then
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -132,7 +132,7 @@
  \"") >&5
    ($PKG_CONFIG --exists --print-errors "
  	libspi-1.0		>= 1.5.0
-@@ -26743,7 +26729,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26837,7 +26823,6 @@ if test -n "$TEST_LIBS"; then
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -140,7 +140,7 @@
  ") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -26755,7 +26740,6 @@ if test -n "$PKG_CONFIG"; then
+@@ -26849,7 +26834,6 @@ if test -n "$TEST_LIBS"; then
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -148,23 +148,23 @@
  " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -26782,7 +26766,6 @@ fi
+@@ -26875,7 +26859,6 @@ fi
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
 -	gdk-pixbuf-xlib-2.0	>= 2.1.0
- "`
+ " 2>&1`
          else
- 	        TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
-@@ -26792,7 +26775,6 @@ fi
+ 	        TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+@@ -26885,7 +26868,6 @@ fi
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
 -	gdk-pixbuf-xlib-2.0	>= 2.1.0
- "`
+ " 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
-@@ -26805,7 +26787,6 @@ fi
+@@ -26898,7 +26880,6 @@ fi
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0
@@ -172,7 +172,7 @@
  ) were not met:
  
  $TEST_PKG_ERRORS
-@@ -26824,7 +26805,6 @@ echo "$as_me: error: Package requirement
+@@ -26917,7 +26898,6 @@ echo "$as_me: error: Package requirement
  	glib-2.0		>= 1.3.11
  	gtk+-2.0		>= 2.1.0
  	gdk-pixbuf-2.0		>= 2.1.0


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-mag.spec	17 Mar 2009 03:17:20 -0000	1.63
+++ gnome-mag.spec	17 Mar 2009 05:48:53 -0000	1.64
@@ -9,7 +9,7 @@
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-mag/0.15/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=562079
-Patch0: gnome-mag-pixbuf-xlib.patch
+# Patch0: gnome-mag-pixbuf-xlib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: intltool
@@ -41,7 +41,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .pixbuf-xlib
+# %patch0 -p1 -b .pixbuf-xlib
 
 %build
 %configure

More information about the fedora-extras-commits mailing list