From 8592e8e46498a471f8004cf8b01ff2900615c39a Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 11 Nov 2005 21:35:40 +0000 Subject: [PATCH] auto-import libXmu-0.99.1-2 on branch devel from libXmu-0.99.1-2.src.rpm --- libXmu.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libXmu.spec b/libXmu.spec index 2a37d55..3a265d3 100644 --- a/libXmu.spec +++ b/libXmu.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXmu/libXmuu runtime libraries Name: libXmu Version: 0.99.1 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -12,7 +12,7 @@ BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXt-devel -Conflicts: XFree86-libs, xorg-x11-libs +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXmu/libXmuu runtime libraries @@ -22,7 +22,7 @@ Summary: X.Org X11 libXmu 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 libXmu development package @@ -101,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xmuu.pc %changelog +* Fri Nov 11 2005 Mike A. Harris 0.99.1-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 0.99.1-1 - Updated libXmu to version 0.99.1 from X11R7 RC1