auto-import libXrender-0.9.0-5 on branch devel from

libXrender-0.9.0-5.src.rpm

libXrender.spec

@@ -2,7 +2,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.0
-Release: 4
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,7 +13,7 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXrender runtime library
@@ -24,7 +24,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXrender development package
@@ -77,6 +77,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.9.0-5
+- 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.9.0-4
 - Updated libXrender to version 0.9.0 from X11R7 RC1