From a10757c132965bb885a136058a387f869bf72322 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Nov 11 2005 21:35:54 +0000
Subject: auto-import libXp-0.99.1-2 on branch devel from libXp-0.99.1-2.src.rpm


---

diff --git a/libXp.spec b/libXp.spec
index ec8180c..505c809 100644
--- a/libXp.spec
+++ b/libXp.spec
@@ -4,7 +4,7 @@ Summary: X.Org X11 libXp runtime library
 #FIXME: Change name to xorg-x11-deprecated-libs like before?
 Name: libXp
 Version: 0.99.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -16,7 +16,7 @@ BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXau-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXp runtime library
@@ -27,7 +27,7 @@ Summary: X.Org X11 libXp 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 libXp development package
@@ -96,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 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 <mharris@redhat.com> 0.99.1-1
 - Updated libXp to version 0.99.1 from X11R7 RC1