From 85ba3dce6f9584e5f4dd94869e808466425f5069 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Thu, 15 Dec 2005 05:42:41 +0000
Subject: [PATCH] auto-import libXpm-3.5.4.1-1 on branch devel from
 libXpm-3.5.4.1-1.src.rpm

---
 .cvsignore  |  2 +-
 libXpm.spec | 49 ++++++++++++++++---------------------------------
 sources     |  2 +-
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1e5d1f6..9a86e39 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXpm-3.5.4.tar.bz2
+libXpm-3.5.4.1.tar.bz2
diff --git a/libXpm.spec b/libXpm.spec
index 97bb146..4d19119 100644
--- a/libXpm.spec
+++ b/libXpm.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.4
-Release: 1.1
+Version: 3.5.4.1
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -16,36 +16,7 @@ BuildRequires: libX11-devel
 # libXext-devel are required build deps in order to get sxpm built.
 BuildRequires: libXt-devel
 BuildRequires: libXext-devel
-%if 0
-[root@fc4i386 RPMS]# ldd /usr/bin/sxpm
-        linux-gate.so.1 =>  (0x0044b000)
-        libXt.so.6 => /usr/lib/libXt.so.6 (0x00f7b000)
-        libSM.so.6 => /usr/lib/libSM.so.6 (0x0081f000)
-        libICE.so.6 => /usr/lib/libICE.so.6 (0x00b6b000)
-        libXext.so.6 => /usr/lib/libXext.so.6 (0x00959000)
-        libXpm.so.4 => /usr/lib/libXpm.so.4 (0x00b01000)
-        libX11.so.6 => /usr/lib/libX11.so.6 (0x00d7e000)
-        libdl.so.2 => /lib/libdl.so.2 (0x00408000)
-        libc.so.6 => /lib/libc.so.6 (0x002b6000)
-        libXau.so.6 => /usr/lib/libXau.so.6 (0x00111000)
-        libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0x00114000)
-        /lib/ld-linux.so.2 (0x00298000)
-[root@fc4i386 RPMS]# rpm -qp --requires xorg-x11-libXpm-devel-3.5.2-2.i386.rpm
-libICE.so.6
-libSM.so.6
-libX11.so.6
-libXext.so.6
-libXpm.so.4
-libXt.so.6
-libc.so.6
-libc.so.6(GLIBC_2.0)
-libc.so.6(GLIBC_2.1)
-libc.so.6(GLIBC_2.3)
-libdl.so.2
-rpmlib(CompressedFileNames) <= 3.0.4-1
-rpmlib(PayloadFilesHavePrefix) <= 4.0-1
-xorg-x11-libXpm = 3.5.2-2
-%endif
+BuildRequires: libXau-devel
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -55,7 +26,10 @@ X.Org X11 libXpm runtime library
 %package devel
 Summary: X.Org X11 libXpm development package
 Group: Development/Libraries
+
 Requires: %{name} = %{version}-%{release}
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: libX11-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -112,9 +86,18 @@ rm -rf $RPM_BUILD_ROOT
 # FIXME: This should be 'man1x'
 %dir %{_mandir}/man1
 %{_mandir}/man1/*.1*
-#%{_mandir}/man1x/*.1x*
+#%{_mandir}/man1/*.1x*
 
 %changelog
+* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 3.5.4.1-1
+- Updated libXpm to version 3.5.4.1 from X11R7 RC3
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure
+  that /usr/lib/X11 and /usr/include/X11 pre-exist.
+- Removed 'x' suffix from manpage directories to match RC3 upstream.
+- Added "Requires: libX11-devel" to devel subpackage as xpm.h includes various
+  X headers. (#174163)
+- Added missing build dep libXau-devel
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index ce9208f..7c0cea5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c7f5b35f8a66f489d6e0bf5997d1784  libXpm-3.5.4.tar.bz2
+a23e253e0da7ec4c4be1edaa682bbb52  libXpm-3.5.4.1.tar.bz2