rpms/libXfont/devel .cvsignore, 1.4, 1.5 libXfont.spec, 1.8, 1.9 sources, 1.4, 1.5 libXfont-0.99.2-fontdir-attrib-fix-bug-172997.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13504/devel

Modified Files:
	.cvsignore libXfont.spec sources 
Removed Files:
	libXfont-0.99.2-fontdir-attrib-fix-bug-172997.patch 
Log Message:
auto-import libXfont-0.99.3-1 on branch devel from libXfont-0.99.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2005 21:34:26 -0000	1.4
+++ .cvsignore	15 Dec 2005 05:41:11 -0000	1.5
@@ -1 +1 @@
-libXfont-0.99.2.tar.bz2
+libXfont-0.99.3.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXfont.spec	9 Dec 2005 22:41:22 -0000	1.8
+++ libXfont.spec	15 Dec 2005 05:41:11 -0000	1.9
@@ -1,14 +1,14 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 0.99.2
-Release: 3.1
+Version: 0.99.3
+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
-Patch0: libXfont-0.99.2-fontdir-attrib-fix-bug-172997.patch
 
+BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libfontenc-devel
@@ -23,6 +23,7 @@
 Summary: X.Org X11 libXfont development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 # NOTE: libXfont headers include proto headers, so this is needed.
 Requires: xorg-x11-proto-devel
 
@@ -33,7 +34,6 @@
 
 %prep
 %setup -q
-%patch -p0 -b .fontdir-attrib-fix-bug-172997
 
 # Disable static library creation by default.
 %define with_static 0
@@ -93,6 +93,14 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Tue Dec 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-1
+- Updated libXfont to version 0.99.3 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.
+- Removed libXfont-0.99.2-fontdir-attrib-fix-bug-172997.patch, which is now
+  integrated upstream.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 21:34:26 -0000	1.4
+++ sources	15 Dec 2005 05:41:11 -0000	1.5
@@ -1 +1 @@
-5cf961b00af1bcb2d55146e8dfb48c3f  libXfont-0.99.2.tar.bz2
+08ed359995921a1092c3bdcd6da8853a  libXfont-0.99.3.tar.bz2


--- libXfont-0.99.2-fontdir-attrib-fix-bug-172997.patch DELETED ---