rpms/xorg-x11-utils/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xorg-x11-utils.spec, 1.17, 1.18 xdpyinfo-1.0.1-spurious-xprint.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 26 19:06:33 UTC 2007


Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-utils.spec 
Removed Files:
	xdpyinfo-1.0.1-spurious-xprint.patch 
Log Message:
auto-import xorg-x11-utils-7.1-4.fc7 on branch devel from xorg-x11-utils-7.1-4.fc7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Jun 2006 05:51:15 -0000	1.5
+++ .cvsignore	26 Mar 2007 19:06:31 -0000	1.6
@@ -1,6 +1,5 @@
-xdpyinfo-1.0.1.tar.bz2
-xdriinfo-1.0.0.tar.bz2
-xev-1.0.1.tar.bz2
+xdriinfo-1.0.1.tar.bz2
+xev-1.0.2.tar.bz2
 xfd-1.0.1.tar.bz2
 xfontsel-1.0.1.tar.bz2
 xlsatoms-1.0.1.tar.bz2
@@ -8,7 +7,5 @@
 xlsfonts-1.0.1.tar.bz2
 xprop-1.0.1.tar.bz2
 xvinfo-1.0.1.tar.bz2
-xwininfo-1.0.1.tar.bz2
 xwininfo-1.0.2.tar.bz2
-xdriinfo-1.0.1.tar.bz2
-xev-1.0.2.tar.bz2
+xdpyinfo-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jun 2006 05:51:15 -0000	1.5
+++ sources	26 Mar 2007 19:06:31 -0000	1.6
@@ -1,4 +1,3 @@
-84cc4798fe62c1d8c67c3f38e8158f70  xdpyinfo-1.0.1.tar.bz2
 be3c5a9b242a57226b5bb5f22ec341ca  xdriinfo-1.0.1.tar.bz2
 e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
 c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
@@ -9,3 +8,4 @@
 9f2cb01264bcaa0455d8b06be6215744  xprop-1.0.1.tar.bz2
 0a5bd8e43de6eb8ff5b5bc673204401d  xvinfo-1.0.1.tar.bz2
 e5dbc8866a55958297f5f38205b6be1e  xwininfo-1.0.2.tar.bz2
+c9ee60ae52c97c51d4ca327e53f0cb61  xdpyinfo-1.0.2.tar.bz2


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-utils.spec	30 Jan 2007 19:19:43 -0000	1.17
+++ xorg-x11-utils.spec	26 Mar 2007 19:06:31 -0000	1.18
@@ -3,13 +3,13 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.1.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.2.tar.bz2
 Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.1.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
@@ -21,12 +21,6 @@
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.1.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.2.tar.bz2
 
-Patch0: xdpyinfo-1.0.1-spurious-xprint.patch
-
-# FIXME: Temporary autoconf/automake deps while we need to hack things up
-# with autotools.
-BuildRequires: autoconf automake
-
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
 BuildRequires: libGL-devel
@@ -55,23 +49,11 @@
 %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
@@ -122,6 +104,9 @@
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Mon Mar 26 2007 Adam Jackson <ajax at redhat.com> 7.1-4
+- xdpyinfo 1.0.2
+
 * Tue Jan 30 2007 Adam Jackson <ajax at redhat.com> 7.1-3
 - Fix man page glob and rebuild for FC7.
 


--- xdpyinfo-1.0.1-spurious-xprint.patch DELETED ---




More information about the fedora-cvs-commits mailing list