[xorg-x11-apps] fix x11perf build

Dave Airlie airlied at fedoraproject.org
Wed Sep 12 06:51:00 UTC 2012


commit ab59844fd5f4890656164adc72a0d7dc4de83354
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Sep 12 02:50:34 2012 -0400

    fix x11perf build

 x11perf-1.4.1-x11perf-datadir-cleanups.patch |   11 -----------
 x11perf-1.5.4-x11perf-datadir-cleanups.patch |   12 ++++++++++++
 xorg-x11-apps.spec                           |    4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/x11perf-1.5.4-x11perf-datadir-cleanups.patch b/x11perf-1.5.4-x11perf-datadir-cleanups.patch
new file mode 100644
index 0000000..da93b29
--- /dev/null
+++ b/x11perf-1.5.4-x11perf-datadir-cleanups.patch
@@ -0,0 +1,12 @@
+diff -up x11perf-1.5.4/configure.ac.dma x11perf-1.5.4/configure.ac
+--- x11perf-1.5.4/configure.ac.dma	2012-09-12 02:46:27.450761915 -0400
++++ x11perf-1.5.4/configure.ac	2012-09-12 02:46:51.105547164 -0400
+@@ -42,7 +42,7 @@ XORG_DEFAULT_OPTIONS
+ AC_TYPE_SIGNAL
+ 
+ # Define the installation directory for the x11 performance compare scripts
+-AC_SUBST([x11perfcompdir], [$libdir/X11/x11perfcomp])
++AC_SUBST([x11perfcompdir], [$datadir/X11/x11perfcomp])
+ 
+ # Checks for programs run by the scripts we install
+ AC_PATH_PROG(MKTEMP, mktemp)
diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec
index 189406c..87cf8a0 100644
--- a/xorg-x11-apps.spec
+++ b/xorg-x11-apps.spec
@@ -33,7 +33,7 @@ Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.1.0.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.3.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.2.tar.bz2
 
-Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
+Patch0: x11perf-1.5.4-x11perf-datadir-cleanups.patch
 Patch2: xconsole-1.0.3-streams-me-softer.patch
 Patch6: xbiff-1.0.2-xmu-configure.patch
 
@@ -77,7 +77,7 @@ A collection of common X Window System applications.
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a13 -a14 -a15 -a16 -a18 -a19 -a20
-%patch0 -p0 -b .x11perf-datadir-cleanups
+%patch0 -p0 -b .x11perf-datadir-cleanup
 #%patch2 -p0 -b .streams-me-softer
 %patch6 -p1 -b .xmu-configure
 


More information about the scm-commits mailing list