auto-import libXres-0.99.2-1 on branch devel from libXres-0.99.2-1.src.rpm

.cvsignore

@@ -1 +1 @@
-libXres-0.99.1.tar.bz2
+libXres-0.99.2.tar.bz2

libXres.spec

@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
-Version: 0.99.1
+Version: 0.99.2
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXres runtime library
@@ -21,7 +21,7 @@ Summary: X.Org X11 libXres 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 libXres development package
@@ -77,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3x/*.3x*
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Updated libXres to version 0.99.2 from X11R7 RC2
+- 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 libXres to version 0.99.1 from X11R7 RC1
 - Updated file manifest to find manpages in "man3x"

sources

@@ -1 +1 @@
-8ad0be786f80bc040079b003ecc7fbb9  libXres-0.99.1.tar.bz2
+63e624cd9ee5dd571366b494b1e64dff  libXres-0.99.2.tar.bz2