rpms/xorg-x11-apps/devel luit-1.0.1-locale.alias-datadir.patch, NONE, 1.1 xorg-x11-apps.spec, 1.9, 1.10

[fedora-cvs-commits at redhat.com]

Author: mharris

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

Modified Files:
	xorg-x11-apps.spec 
Added Files:
	luit-1.0.1-locale.alias-datadir.patch 
Log Message:
* 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)


luit-1.0.1-locale.alias-datadir.patch:
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE luit-1.0.1-locale.alias-datadir.patch ---
--- luit-1.0.1/configure.ac.old	2006-02-16 17:00:46.706577376 +0100
+++ luit-1.0.1/configure.ac	2006-02-16 17:02:05.442878408 +0100
@@ -36,9 +36,9 @@
 
 AC_ARG_WITH(localealiasfile,
         AC_HELP_STRING([--with-localealiasfile=<path>],
-                       [The locale alias file (default: ${libdir}/X11/locale/locale.alias)]),
+                       [The locale alias file (default: ${datadir}/X11/locale/locale.alias)]),
         [LOCALEALIASFILE="$withval"],
-        [LOCALEALIASFILE=${libdir}/X11/locale/locale.alias])
+        [LOCALEALIASFILE=${datadir}/X11/locale/locale.alias])
 AC_SUBST([LOCALEALIASFILE])
 
 # Checks for pkg-config packages


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-apps.spec	11 Feb 2006 06:13:39 -0000	1.9
+++ xorg-x11-apps.spec	24 Feb 2006 12:14:19 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: X.Org X11 applications
 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
@@ -31,11 +31,8 @@
 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
+Patch1: luit-1.0.1-locale.alias-datadir.patch
 
-# FIXME: Most of the BuildRequires are not figured out yet, so are missing.
-# This will get fixed once someone builds it with mock in a minimal build
-# environment, but it works in beehive for the time being, so we'll move on
-# to bigger problems to solve rather than wasting time right now.
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # xbiff needs xbitmaps-devel
@@ -56,6 +53,7 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
 %patch0 -p0 -b .x11perf-datadir-cleanups
+%patch1 -p0 -b .locale.alias-datadir
 
 %build
 # Build all apps
@@ -68,6 +66,9 @@
          x11perf*)
             aclocal ; automake ; autoconf
          ;;
+         luit*)
+            autoconf
+         ;;
       esac
 
       %configure --disable-xprint
@@ -173,10 +174,13 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* 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)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
@@ -206,7 +210,7 @@
   - xmessage-0.99.1-xmessage-datadir-cleanups.patch
 - Added luit-0.99.1-luit-locale-dir-fix.patch to fix bug (#173702)
 
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0.99.2-3
+* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.2-3
 - add Requires(pre) on newer filesystem package (#172610)
 
 * Sun Nov 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2