auto-import libXcomposite-0.2.2-1 on branch devel from

libXcomposite-0.2.2-1.src.rpm

.cvsignore

@@ -1 +1 @@
-libXcomposite-0.2.1.tar.bz2
+libXcomposite-0.2.2.tar.bz2

libXcomposite.spec

@@ -1,7 +1,7 @@
 
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
-Version: 0.2.1
+Version: 0.2.2
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -15,7 +15,7 @@ BuildRequires: libXext-devel
 BuildRequires: libXfixes-devel
 
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXcomposite runtime library
@@ -26,7 +26,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 libXcomposite development package
@@ -79,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.2.2-1
+- Updated libXcomposite to version 0.2.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.2.1-1
 - Updated libXcomposite to version 0.2.1 from X11R7 RC1
 

sources

@@ -1 +1 @@
-d3bec9b6a45117b9c8fa509829c2946f  libXcomposite-0.2.1.tar.bz2
+76be33ca2ac3c53909b5621ea0e3a116  libXcomposite-0.2.2.tar.bz2