From 4012991d8b311d0b34d79ccf3ecd3964719d9b82 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 11 Nov 2005 21:37:08 +0000
Subject: [PATCH] auto-import libXt-0.99.2-1 on branch devel from
 libXt-0.99.2-1.src.rpm

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

diff --git a/.cvsignore b/.cvsignore
index 89be6a2..8bd272d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXt-0.99.1.tar.bz2
+libXt-0.99.2.tar.bz2
diff --git a/libXt.spec b/libXt.spec
index 45d83d9..e1ce7a9 100644
--- a/libXt.spec
+++ b/libXt.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
-Version: 0.99.1
-Release: 3
+Version: 0.99.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -12,7 +12,7 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libSM-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXt runtime library
@@ -24,7 +24,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: libX11-devel
 Requires: libSM-devel
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXt development package
@@ -123,6 +123,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 libXt 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'
+
+
 * Wed Nov 2 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
 - Actually spell RPM_OPT_FLAGS correctly this time.
 
diff --git a/sources b/sources
index 732f562..128f4b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c70360ab5ffba0651c24fc3e4fe84f93  libXt-0.99.1.tar.bz2
+de83ffef886cfb03334243c897ff64ee  libXt-0.99.2.tar.bz2