From a77b5dea4bf72d309b3babf75ca7affe8c02a810 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Feb 21 2009 20:53:08 +0000
Subject: - Merge review cleanups. (#226062)


---

diff --git a/libX11-0.99.3-datadir-locale-dir-fix.patch b/libX11-0.99.3-datadir-locale-dir-fix.patch
deleted file mode 100644
index c54cc4d..0000000
--- a/libX11-0.99.3-datadir-locale-dir-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixes Red Hat bug #173282
-
---- configure.ac.datadir-locale-dir-fix	2005-11-22 12:34:53.000000000 -0500
-+++ configure.ac	2005-11-22 12:35:13.000000000 -0500
-@@ -306,7 +306,7 @@
- # in ${libdir}
- #
- 
--X11_LOCALEDATADIR="${X11_LIBDIR}/locale"
-+X11_LOCALEDATADIR="${X11_DATADIR}/locale"
- X11_LOCALELIBDIR="${X11_LIBDIR}/locale/lib"
- X11_LOCALEDIR="${X11_LOCALEDATADIR}"
- XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
diff --git a/libX11.spec b/libX11.spec
index 640b5c7..600c887 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,10 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 #Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 
 
-# FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate
-# this patch is now committed upstream.  When libX11-1.0.4 is released,
-# manually confirm each patch hunk before removal.
-Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch2: dont-forward-keycode-0.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
@@ -27,8 +23,6 @@ BuildRequires: libXdmcp-devel
 
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libX11 runtime library
 
@@ -43,21 +37,16 @@ Requires: xorg-x11-proto-devel >= 7.1-2
 Requires: libXau-devel, libXdmcp-devel, libxcb-devel
 Requires: pkgconfig
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
 X.Org X11 libX11 development package
 
 %prep
 %setup -q
-# FIXME: We are keeping this around, as upstream has a tendency for random
-# people to revert fixes other people have applied, and have a 6-8 month tug
-# of war with these things.  It's easier to leave this here than to try and
-# find it later.
-#%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 
 %build
+# sodding libtool
+autoreconf -v --install
 %configure \
 	--disable-dependency-tracking \
 	--disable-static
@@ -70,10 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
-find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+find $RPM_BUILD_ROOT -type f -name '*.la' -delete
 
 # FIXME: Don't install Xcms.txt - find out why upstream still ships this.
-find $RPM_BUILD_ROOT -name 'Xcms.txt' -exec rm -f {} \;
+find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,10 +101,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libX11-xcb.so
 %{_libdir}/pkgconfig/x11.pc
 %{_libdir}/pkgconfig/x11-xcb.pc
-#%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sat Feb 21 2009 Adam Jackson <ajax@redhat.com> 1.2-2
+- Merge review cleanups. (#226062)
+
 * Wed Feb 18 2009 Adam Jackson <ajax@redhat.com> 1.2-1
 - libX11 1.2