From e2e3b13158f97c5326b7adbb78d5e4db2fdb4d94 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 16 Dec 2005 10:59:17 +0000
Subject: [PATCH] auto-import libX11-1.0.0-1 on branch devel from
 libX11-1.0.0-1.src.rpm

---
 .cvsignore  |  2 +-
 libX11.spec | 22 +++++++++++++++++-----
 sources     |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a7a85f6..108e499 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libX11-0.99.3.tar.bz2
+libX11-1.0.0.tar.bz2
diff --git a/libX11.spec b/libX11.spec
index 16bfad3..b4224ba 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,12 +1,12 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 0.99.3
-Release: 4.1
+Version: 1.0.0
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 
 BuildRequires: pkgconfig
@@ -15,6 +15,8 @@ BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
+BuildRequires: autoconf
+
 # FIXME: check if still needed for X11R7
 Requires(pre): filesystem >= 2.3.6-1
 
@@ -27,6 +29,7 @@ X.Org X11 libX11 runtime library
 Summary: X.Org X11 libX11 development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: xorg-x11-proto-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -231,10 +234,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/x11.pc
-%dir %{_mandir}/man3x
-%{_mandir}/man3x/*.3x*
+%dir %{_mandir}/man3
+%{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Dec 16 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
+- Updated libX11 to version 1.0.0 from X11R7 RC4
+
+* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.4-1
+- Updated libX11 to version 0.99.4 from X11R7 RC3
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure
+  that /usr/lib/X11 and /usr/include/X11 pre-exist.
+- Removed 'x' suffix from manpage directories to match RC3 upstream.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 86060c3..0d71ab3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9974ce19858368c3addf87a193c80266  libX11-0.99.3.tar.bz2
+b5014273518e724e7c64bf17ff8fe555  libX11-1.0.0.tar.bz2