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

---
 .cvsignore  |  2 +-
 libXpm.spec | 12 +++++++++---
 sources     |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 06a51c5..1e5d1f6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXpm-3.5.3.tar.bz2
+libXpm-3.5.4.tar.bz2
diff --git a/libXpm.spec b/libXpm.spec
index 84203e0..3724cd5 100644
--- a/libXpm.spec
+++ b/libXpm.spec
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.3
+Version: 3.5.4
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -47,7 +47,7 @@ rpmlib(PayloadFilesHavePrefix) <= 4.0-1
 xorg-x11-libXpm = 3.5.2-2
 %endif
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXpm runtime library
@@ -57,7 +57,7 @@ Summary: X.Org X11 libXpm 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 libXpm development package
@@ -115,6 +115,12 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1x/*.1x*
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 3.5.4-1
+- Updated libXpm to version 3.5.4 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> 3.5.3-1
 - Updated libXpm to version 3.5.3 from X11R7 RC1
 - Added manpages for sxpm, cxpm
diff --git a/sources b/sources
index 18092d2..ce9208f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-401332768720b4fc2790006c4cfde82a  libXpm-3.5.3.tar.bz2
+8c7f5b35f8a66f489d6e0bf5997d1784  libXpm-3.5.4.tar.bz2