rpms/xorg-x11-apps/devel x11perf-1.4.1-x11perf-datadir-cleanups.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-apps.spec, 1.11, 1.12 x11perf-1.0.1-x11perf-datadir-cleanups.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-apps.spec 
Added Files:
	x11perf-1.4.1-x11perf-datadir-cleanups.patch 
Removed Files:
	x11perf-1.0.1-x11perf-datadir-cleanups.patch 
Log Message:
auto-import xorg-x11-apps-1.0.2-1 on branch devel from xorg-x11-apps-1.0.2-1.src.rpm

x11perf-1.4.1-x11perf-datadir-cleanups.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE x11perf-1.4.1-x11perf-datadir-cleanups.patch ---
--- x11perf-0.99.1/Makefile.am.x11perf-datadir-cleanups	2005-11-23 13:03:27.000000000 -0500
+++ x11perf-1.4.1/Makefile.am	2005-11-23 13:03:57.000000000 -0500
@@ -23,7 +23,7 @@
 
 bin_SCRIPTS = x11perfcomp
 
-LIBPATH = $(libdir)/X11/x11perfcomp
+LIBPATH = $(datadir)/X11/x11perfcomp
 
 x11perfcompdir = $(LIBPATH)
 dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jan 2006 16:29:41 -0000	1.4
+++ .cvsignore	3 Mar 2006 01:37:12 -0000	1.5
@@ -1,6 +1,5 @@
 luit-1.0.1.tar.bz2
 oclock-1.0.1.tar.bz2
-x11perf-1.0.1.tar.bz2
 xbiff-1.0.1.tar.bz2
 xclipboard-1.0.1.tar.bz2
 xclock-1.0.1.tar.bz2
@@ -15,3 +14,4 @@
 xpr-1.0.1.tar.bz2
 xwd-1.0.1.tar.bz2
 xwud-1.0.1.tar.bz2
+x11perf-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jan 2006 16:29:41 -0000	1.4
+++ sources	3 Mar 2006 01:37:12 -0000	1.5
@@ -1,6 +1,5 @@
 fbe44e739590d3d73f711bfc8a0e33fd  luit-1.0.1.tar.bz2
 91f49547f9ed3cd0137c8b7c3183e360  oclock-1.0.1.tar.bz2
-d13b4eb920b0f51dc538c34d1b3afbce  x11perf-1.0.1.tar.bz2
 404f5add4537d22dd109c33e518a5190  xbiff-1.0.1.tar.bz2
 2c6ecedb10dc51adbb64c95f22fd99c2  xclipboard-1.0.1.tar.bz2
 81af93fb9bd06319fd16b694b0f03aeb  xclock-1.0.1.tar.bz2
@@ -15,3 +14,4 @@
 01c0a14755fc91369e8c011c9f881d5d  xpr-1.0.1.tar.bz2
 911addfb7fa402217ddac63e5c1d97c7  xwd-1.0.1.tar.bz2
 6e3c5d0297d88e890b6f5df31f73dd60  xwud-1.0.1.tar.bz2
+fd06c8b8e3572a0e14af65a49e0dd7d1  x11perf-1.4.1.tar.bz2


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-apps.spec	1 Mar 2006 06:18:26 -0000	1.11
+++ xorg-x11-apps.spec	3 Mar 2006 01:37:12 -0000	1.12
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -18,7 +18,7 @@
 Source4:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xpr-1.0.1.tar.bz2
 # Miscellaneous other applications
 Source5:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/luit-1.0.1.tar.bz2
-Source6:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/x11perf-1.0.1.tar.bz2
+Source6:  http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2
 Source7:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xbiff-1.0.1.tar.bz2
 Source8:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclipboard-1.0.1.tar.bz2
 Source9:  http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xconsole-1.0.1.tar.bz2
@@ -30,7 +30,7 @@
 Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmag-1.0.1.tar.bz2
 Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmessage-1.0.1.tar.bz2
 
-Patch0: x11perf-1.0.1-x11perf-datadir-cleanups.patch
+Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
 Patch1: luit-1.0.1-locale.alias-datadir.patch
 
 BuildRequires: pkgconfig
@@ -155,6 +155,9 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
+* Thu Mar 2 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Bump x11perf to 1.4.1 from upstream.
+
 * Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added luit-1.0.1-locale.alias-datadir.patch to fix bug (#181785)
 


--- x11perf-1.0.1-x11perf-datadir-cleanups.patch DELETED ---