From 02b71f7e15dc3dd941051fc20e8f5bf9ec2d65ff Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Thu, 27 Oct 2005 09:55:15 +0000
Subject: [PATCH] auto-import libXres-0.99.1-1 on branch devel from
 libXres-0.99.1-1.src.rpm

---
 .cvsignore   |  2 +-
 libXres.spec | 15 ++++++++-------
 sources      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3e850b3..f9c070f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXres-0.99.0.tar.bz2
+libXres-0.99.1.tar.bz2
diff --git a/libXres.spec b/libXres.spec
index d0ebc64..298ddf9 100644
--- a/libXres.spec
+++ b/libXres.spec
@@ -1,8 +1,7 @@
-
 Summary: X.Org X11 libXres runtime library
 Name: libXres
-Version: 0.99.0
-Release: 3
+Version: 0.99.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -12,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
-
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -23,7 +21,6 @@ Summary: X.Org X11 libXres development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
@@ -76,10 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xres.pc
 %dir %{_mandir}
-%dir %{_mandir}/man3
-%{_mandir}/man3/XRes.3.gz
+%dir %{_mandir}/man3x
+%{_mandir}/man3x/*.3x*
 
 %changelog
+* Mon Oct 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
+- Updated libXres to version 0.99.1 from X11R7 RC1
+- Updated file manifest to find manpages in "man3x"
+
 * Thu Sep 29 2005 Mike A. Harris <mharris.com> 0.99.0-3
 - Renamed package to remove xorg-x11 from the name due to unanimous decision
   between developers.
diff --git a/sources b/sources
index 8ccd365..a7b747c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb705942677fb7bc28ef42db5e602ff4  libXres-0.99.0.tar.bz2
+8ad0be786f80bc040079b003ecc7fbb9  libXres-0.99.1.tar.bz2