From cbde0b6e06ded430b28a0cd4f1013a4e17259ead Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 11 Nov 2005 21:29:11 +0000
Subject: [PATCH] auto-import libXdamage-1.0.2-1 on branch devel from    
 libXdamage-1.0.2-1.src.rpm

---
 .cvsignore      |  2 +-
 libXdamage.spec | 14 ++++++++++----
 sources         |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index bf45fdc..07c28fb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXdamage-1.0.1.tar.bz2
+libXdamage-1.0.2.tar.bz2
diff --git a/libXdamage.spec b/libXdamage.spec
index 6229339..542385a 100644
--- a/libXdamage.spec
+++ b/libXdamage.spec
@@ -1,8 +1,8 @@
 
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
-Version: 1.0.1
-Release: 4
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,7 +13,7 @@ BuildRequires: libX11-devel
 BuildRequires: libXfixes-devel
 
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXdamage 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 libXdamage development package
@@ -77,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 1.0.2-1
+- Updated libXdamage to version 1.0.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> 1.0.1-4
 - Updated libXdamage to version 1.0.1 from X11R7 RC1
 
diff --git a/sources b/sources
index 05d631b..aa4f26f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59894385afae5af988084af7db8a8267  libXdamage-1.0.1.tar.bz2
+b0ab2a9e3d08896a40910246c8bcc335  libXdamage-1.0.2.tar.bz2