From 02fc23e99006abe3ae6d45f4e5d9f7459ce6f5c0 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 11 Nov 2005 21:39:49 +0000 Subject: [PATCH] auto-import libxkbfile-0.99.1-3 on branch devel from libxkbfile-0.99.1-3.src.rpm --- libxkbfile.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libxkbfile.spec b/libxkbfile.spec index 5926e3f..87a7045 100644 --- a/libxkbfile.spec +++ b/libxkbfile.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libxkbfile runtime library Name: libxkbfile Version: 0.99.1 -Release: 2 +Release: 3 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libxkbfile runtime library @@ -21,7 +21,7 @@ Summary: X.Org X11 libxkbfile 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 libxkbfile development package @@ -81,6 +81,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xkbfile.pc %changelog +* Fri Nov 11 2005 Mike A. Harris 0.99.1-3 +- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' +- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' + + * Thu Oct 27 2005 Mike A. Harris 0.99.1-2 - Work around pointer aliasing problem with -fno-strict-aliasing