rpms/xorg-x11-server-utils/devel xset-1.0.2-spurious-xprint.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xorg-x11-server-utils.spec, 1.15, 1.16 xset-1.0.1-spurious-xprint.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 27 21:39:45 UTC 2006 

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Added Files:
	xset-1.0.2-spurious-xprint.patch 
Removed Files:
	xset-1.0.1-spurious-xprint.patch 
Log Message:
auto-import xorg-x11-server-utils-1.0.1-4 on branch devel from xorg-x11-server-utils-1.0.1-4.src.rpm

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

--- NEW FILE xset-1.0.2-spurious-xprint.patch ---
--- xset-1.0.2/configure.ac.xprint	2006-04-25 17:41:21.000000000 -0400
+++ xset-1.0.2/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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Apr 2006 00:24:48 -0000	1.5
+++ .cvsignore	27 Apr 2006 21:39:43 -0000	1.6
@@ -3,15 +3,15 @@
 sessreg-1.0.0.tar.bz2
 xcmsdb-1.0.1.tar.bz2
 xgamma-1.0.1.tar.bz2
-xmodmap-1.0.0.tar.bz2
-xrandr-1.0.1.tar.bz2
-xrdb-1.0.1.tar.bz2
+xhost-1.0.1.tar.bz2
 xrefresh-1.0.1.tar.bz2
-xset-1.0.1.tar.bz2
 xsetmode-1.0.0.tar.bz2
 xsetpointer-1.0.0.tar.bz2
 xsetroot-1.0.1.tar.bz2
 xstdcmap-1.0.1.tar.bz2
 xtrap-1.0.1.tar.bz2
 xvidtune-1.0.1.tar.bz2
-xhost-1.0.1.tar.bz2
+xmodmap-1.0.1.tar.bz2
+xrandr-1.0.2.tar.bz2
+xrdb-1.0.2.tar.bz2
+xset-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Apr 2006 00:24:48 -0000	1.5
+++ sources	27 Apr 2006 21:39:43 -0000	1.6
@@ -3,15 +3,15 @@
 15c8032bbf5197e8fb5d071d9500a880  sessreg-1.0.0.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
 45d8fa3c85d4bfda87251798fd605a45  xgamma-1.0.1.tar.bz2
-6c45ef77c26dce98e625d1f99df16468  xmodmap-1.0.0.tar.bz2
-14de596b7276c46b77e336cbb4f13c24  xrandr-1.0.1.tar.bz2
-9ed059ee45780d32c697d4acc6b07192  xrdb-1.0.1.tar.bz2
+5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
 8e211e4dfa178d2797cea058709f72ab  xrefresh-1.0.1.tar.bz2
-efd71993a9dc96566dd3e89f507ccac5  xset-1.0.1.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 c94ea103e27e370e4e5030e50c5d5d69  xsetpointer-1.0.0.tar.bz2
 fc7eeb7130bb54345671a9dbaab567ac  xsetroot-1.0.1.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
 e49c695a0af17bc4896e51c298304643  xtrap-1.0.1.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
-5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
+66b8f25e9152e20849638d93a550ff7f  xmodmap-1.0.1.tar.bz2
+7157156809c7f432ae401859b0465ffe  xrandr-1.0.2.tar.bz2
+de1fd8e2169e813e43f43ced5837b989  xrdb-1.0.2.tar.bz2
+1b781a0802c7b8fb9619a6665607b3f0  xset-1.0.2.tar.bz2


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-server-utils.spec	25 Apr 2006 21:55:33 -0000	1.15
+++ xorg-x11-server-utils.spec	27 Apr 2006 21:39:43 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -14,11 +14,11 @@
 Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcmsdb-1.0.1.tar.bz2
 Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xgamma-1.0.1.tar.bz2
 Source6:  http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmodmap-1.0.0.tar.bz2
-Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrandr-1.0.1.tar.bz2
-Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrdb-1.0.1.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.1.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/individual/app/xrandr-1.0.2.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/individual/app/xrdb-1.0.2.tar.bz2
 Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrefresh-1.0.1.tar.bz2
-Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xset-1.0.1.tar.bz2
+Source11: http://xorg.freedesktop.org/releases/individual/app/xset-1.0.2.tar.bz2
 Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetmode-1.0.0.tar.bz2
 Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetpointer-1.0.0.tar.bz2
 Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetroot-1.0.1.tar.bz2
@@ -37,7 +37,7 @@
 # rgb section
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 # xset section
-Patch1200: xset-1.0.1-spurious-xprint.patch
+Patch1200: xset-1.0.2-spurious-xprint.patch
 # xvidtune section
 #Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
 
@@ -195,6 +195,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-4
+- Updated xmodmap, xrandr, xrdb, and xset.
+
 * Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-3
 - Eliminate a spurious Xprint dependency from xset.
 


--- xset-1.0.1-spurious-xprint.patch DELETED ---

More information about the fedora-cvs-commits mailing list