From cd9db6ee190993f7260dba040b7c81d2a462b05e Mon Sep 17 00:00:00 2001
From: pnemade <pnemade@fedoraproject.org>
Date: Mon, 14 Jan 2008 09:32:18 +0000
Subject: [PATCH] - Merge Review #226081 Spec cleanups

---
 libXpm.spec | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libXpm.spec b/libXpm.spec
index 9367c9a..f9f6b59 100644
--- a/libXpm.spec
+++ b/libXpm.spec
@@ -1,8 +1,8 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.7
-Release: 1%{?dist}
-License: MIT/X11
+Release: 2%{?dist}
+License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: gettext
-BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 # FIXME: Although ./configure checks for libXt and libXext, and indicates
@@ -32,7 +31,7 @@ Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: libX11-devel
+Requires: libX11-devel pkgconfig
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -50,7 +49,7 @@ X.Org X11 libXpm development package
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,13 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING CHANGES ChangeLog
 %{_libdir}/libXpm.so.4
 %{_libdir}/libXpm.so.4.11.0
 
 %files devel
 %defattr(-,root,root,-)
-%defattr(-,root,root,-)
 %{_bindir}/cxpm
 %{_bindir}/sxpm
 %dir %{_includedir}/X11
@@ -89,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Mon Jan 14 2008 parag <paragn@fedoraproject.org> 3.5.7-2
+- Merge Review #226081 Spec cleanups
+
 * Mon Sep 24 2007 Adam Jackson <ajax@redhat.com> 3.5.7-1
 - libXpm 3.5.7