From f72efe66b542d5d0e43fc7ff2c49a73a5bdbaa36 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Nov 11 2005 21:27:21 +0000
Subject: auto-import libX11-0.99.3-1 on branch devel from libX11-0.99.3-1.src.rpm


---

diff --git a/.cvsignore b/.cvsignore
index 1daf3bc..a7a85f6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-libX11-0.99.0.tar.bz2
-libX11-0.99.2.tar.bz2
+libX11-0.99.3.tar.bz2
diff --git a/libX11.spec b/libX11.spec
index 68365c3..a7d439a 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -7,8 +7,8 @@
 
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 0.99.2
-Release: 2
+Version: 0.99.3
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,7 +21,7 @@ BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libX11 runtime library
@@ -32,7 +32,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libX11 development package
@@ -233,6 +233,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3x/*.3x*
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
+- Updated libX11 to version 0.99.3 from X11R7 RC2
+- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
+- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
+
+
 * Mon Nov 7 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
 - Fix devel subpackage summary and description with s/libXdmcp/libX11/
 
diff --git a/sources b/sources
index 252479d..86060c3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0bb745ed34f8bf09d0c0d89ff91c56b4  libX11-0.99.0.tar.bz2
-f7c5652798066e4221163b7aca4e3e64  libX11-0.99.2.tar.bz2
+9974ce19858368c3addf87a193c80266  libX11-0.99.3.tar.bz2