From c370f410590d498805198c6285ce6119f3c6afcf Mon Sep 17 00:00:00 2001 From: mharris Date: Thu, 15 Dec 2005 05:41:39 +0000 Subject: [PATCH] auto-import libXft-2.1.8.1-1 on branch devel from libXft-2.1.8.1-1.src.rpm --- .cvsignore | 2 +- libXft.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b5021bc..b6bff6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXft-2.1.8.tar.bz2 +libXft-2.1.8.1.tar.bz2 diff --git a/libXft.spec b/libXft.spec index 285e26d..c1c987d 100644 --- a/libXft.spec +++ b/libXft.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXft runtime library Name: libXft -Version: 2.1.8 -Release: 2.1 +Version: 2.1.8.1 +Release: 1 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -25,6 +25,10 @@ X.Org X11 libXft runtime library Summary: X.Org X11 libXft development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires(pre): xorg-x11-filesystem >= 0.99.2-3 + +Requires: libXrender-devel + Obsoletes: XFree86-devel, xorg-x11-devel @@ -90,6 +94,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Xft.3* %changelog +* Tue Dec 13 2005 Mike A. Harris 2.1.8.1-1 +- Updated libXft to version 2.1.8.1 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. +- Added "Requires: libXrender-devel" to -devel subpackage for (#175465) + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index 63f86c7..16ddf49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efffd93b884fd6f2ffe11c6fdd1baa8a libXft-2.1.8.tar.bz2 +185a52e8043aaafcd9cbaa59c206012b libXft-2.1.8.1.tar.bz2