- Added "BuildRequires: pkgconfig" for (#193427)

- Replace "makeinstall" with "make install DESTDIR=..."
- Remove package ownership of mandir/libdir/etc.

libXpm.spec

@@ -1,13 +1,14 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.5
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 # FIXME: Although ./configure checks for libXt and libXext, and indicates
@@ -51,7 +52,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -65,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXpm.so.4
 %{_libdir}/libXpm.so.4.11.0
 
@@ -82,13 +83,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXpm.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xpm.pc
-%dir %{_mandir}
-# FIXME: This should be 'man1x'
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/*.1*
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Mon Jun 05 2006 Mike A. Harris <mharris@redhat.com> 3.5.5-2
+- Added "BuildRequires: pkgconfig" for (#193427)
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 26 2006 Adam Jackson <ajackson@redhat.com> 3.5.5-1
 - Update to 3.5.5