rpms/xorg-x11-server-utils/devel xset-1.0.1-spurious-xprint.patch, NONE, 1.1 xorg-x11-server-utils.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7564

Modified Files:
	xorg-x11-server-utils.spec 
Added Files:
	xset-1.0.1-spurious-xprint.patch 
Log Message:
- Eliminate a spurious Xprint dependency from xset.


xset-1.0.1-spurious-xprint.patch:
 configure.ac |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

--- NEW FILE xset-1.0.1-spurious-xprint.patch ---
--- xset-1.0.1/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
+++ xset-1.0.1/configure.ac	2006-04-25 17:41:46.000000000 -0400
@@ -62,14 +62,8 @@
 	AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(SET_XPRINT, xp, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $SET_XPRINT_CFLAGS $SET_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS $SET_XPRINT_CFLAGS"
-XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS $SET_XPRINT_LIBS"
+XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS"
+XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS"
 
 AC_SUBST(XSET_CFLAGS)
 AC_SUBST(XSET_LIBS)


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-server-utils.spec	15 Apr 2006 00:24:48 -0000	1.14
+++ xorg-x11-server-utils.spec	25 Apr 2006 21:55:33 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -36,6 +36,8 @@
 
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
+# xset section
+Patch1200: xset-1.0.1-spurious-xprint.patch
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
 
@@ -75,7 +77,7 @@
 %setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 
 %patch1100 -p0 -b .datadir-rgbpath-fix
-
+%patch1200 -p0 -b .xprint
 #%patch1700 -p0 -b .datadir-app-defaults-fix
 
 %build
@@ -94,6 +96,13 @@
             autoconf
             %configure ;# --with-rgb-db=%{_datadir}/X11
             ;;
+	 xset-*)
+	    # FIXME: run autotools junk to kick in our patch
+	    aclocal --force
+	    automake -f
+	    autoconf
+	    %configure
+	    ;;
          xvidtune-*)
             # FIXME: run autotools junk to kick in our patch
             aclocal --force
@@ -186,6 +195,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-3
+- Eliminate a spurious Xprint dependency from xset.
+
 * Fri Apr 14 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
 - Drop lbxproxy, LBX is deprecated upstream
 - Update to xhost 1.0.1