rpms/gnome-utils/devel gnome-utils-libs.patch,1.3,1.4

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-utils-libs.patch 
Log Message:
try again


gnome-utils-libs.patch:
 baobab/src/Makefile.am           |    1 +
 configure.ac                     |    4 ++--
 gnome-dictionary/src/Makefile.am |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

Index: gnome-utils-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils-libs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gnome-utils-libs.patch	14 Feb 2010 18:28:29 -0000	1.3
+++ gnome-utils-libs.patch	14 Feb 2010 18:40:37 -0000	1.4
@@ -9,6 +9,21 @@ diff -up gnome-utils-2.29.5/baobab/src/M
  	$(GNOME_UTILS_LIBS)		\
  	$(LIBGTOP_LIBS)			\
  	$(NULL)
+diff -up gnome-utils-2.29.5/configure.ac.libs gnome-utils-2.29.5/configure.ac
+--- gnome-utils-2.29.5/configure.ac.libs	2010-02-14 13:37:34.858154772 -0500
++++ gnome-utils-2.29.5/configure.ac	2010-02-14 13:37:13.376904304 -0500
+@@ -123,9 +123,9 @@ AC_SUBST(GDICT_VERSION)
+ 
+ # xext for gnome-screenshot; in theory checking for xext should be
+ # enough but there are a lot of broken distros out there
+-PKG_CHECK_MODULES(XSHAPE, xext,
++PKG_CHECK_MODULES(XSHAPE, xext x11,
+                   [],
+-                  [AC_CHECK_HEADERS(X11/extensions/shape.h, XSHAPE_LIBS="-lXext")])
++                  [AC_CHECK_HEADERS(X11/extensions/shape.h, XSHAPE_LIBS="-lXext -lX11")])
+ AC_SUBST(XSHAPE_LIBS)
+ 
+ # gio-unix is needed for gsearchtool
 diff -up gnome-utils-2.29.5/gnome-dictionary/src/Makefile.am.libs gnome-utils-2.29.5/gnome-dictionary/src/Makefile.am
 --- gnome-utils-2.29.5/gnome-dictionary/src/Makefile.am.libs	2010-02-14 13:17:12.610162309 -0500
 +++ gnome-utils-2.29.5/gnome-dictionary/src/Makefile.am	2010-02-14 13:26:07.240182007 -0500