auto-import libXinerama-0.99.1-2 on branch devel from

libXinerama-0.99.1-2.src.rpm

libXinerama.spec

@@ -2,7 +2,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 0.99.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -14,7 +14,7 @@ BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXinerama runtime library
@@ -25,7 +25,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 libXinerama development package
@@ -75,6 +75,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xinerama.pc
 
 %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 libXinerama to version 0.99.1 from X11R7 RC1