From 39e3fdb3914df53f68a5c9e22c787eacff0c44b0 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 11 Nov 2005 21:35:02 +0000 Subject: [PATCH] auto-import libXft-2.1.8-2 on branch devel from libXft-2.1.8-2.src.rpm --- libXft.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libXft.spec b/libXft.spec index 9f7d0f5..e0a7f23 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: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -16,7 +16,7 @@ BuildRequires: fontconfig-devel >= 2.2 Requires: fontconfig >= 2.2 -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXft runtime library @@ -26,7 +26,7 @@ Summary: X.Org X11 libXft development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Conflicts: XFree86-devel, xorg-x11-devel +Obsoletes: XFree86-devel, xorg-x11-devel %description devel X.Org X11 libXft development package @@ -90,6 +90,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Xft.3* %changelog +* Fri Nov 11 2005 Mike A. Harris 2.1.8-2 +- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' +- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' + + * Mon Oct 24 2005 Mike A. Harris 2.1.8-1 - Updated libXft to version 2.1.8 from X11R7 RC1