rpms/xorg-x11-utils/devel xdpyinfo-1.0.1-spurious-xprint.patch, NONE, 1.1 xorg-x11-utils.spec, 1.10, 1.11

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 25 22:43:21 UTC 2006


Author: ajackson

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

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


xdpyinfo-1.0.1-spurious-xprint.patch:
 configure.ac |    6 ------
 1 files changed, 6 deletions(-)

--- NEW FILE xdpyinfo-1.0.1-spurious-xprint.patch ---
--- xdpyinfo-1.0.1/configure.ac.xprint	2006-04-25 18:08:03.000000000 -0400
+++ xdpyinfo-1.0.1/configure.ac	2006-04-25 18:08:18.000000000 -0400
@@ -97,12 +97,6 @@
 	AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>])
 	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 
-PKG_CHECK_MODULES(DPY_XPRINT, xp, 
-	[SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $DPY_XPRINT_CFLAGS $DPY_X11_CFLAGS"
-	AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
-	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
 PKG_CHECK_MODULES(DPY_XTST, xtst, 
 	[SAVE_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $DPY_XTST_CFLAGS $DPY_X11_CFLAGS"


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-utils.spec	1 Mar 2006 06:43:42 -0000	1.10
+++ xorg-x11-utils.spec	25 Apr 2006 22:43:18 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -20,6 +20,8 @@
 Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xvinfo-1.0.1.tar.bz2
 Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwininfo-1.0.1.tar.bz2
 
+Patch0: xdpyinfo-1.0.1-spurious-xprint.patch
+
 %define applist xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,11 +44,23 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10
 
+%patch0 -p0 -b .xprint
+
 %build
 # Build all apps
 {
    for app in * ; do
       pushd $app
+      case $app in
+         xdpyinfo-*)
+	    # FIXME: run autotools junk to kick in our patch
+	    aclocal --force
+	    automake -f
+	    autoconf
+	    ;;
+	 *)
+	    ;;
+      esac
       %configure
       make
       popd
@@ -99,6 +113,9 @@
 %{_mandir}/man1/xwininfo.1x*
 
 %changelog
+* Tue Apr 25 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
+- Remove a spurious Xprint dependency from xdpyinfo.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 




More information about the fedora-cvs-commits mailing list