rpms/libXpm/devel libXpm.spec,1.21,1.22

[Parag Nemade (pnemade)]

Author: pnemade

Update of /cvs/pkgs/rpms/libXpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21068

Modified Files:
	libXpm.spec 
Log Message:
* Mon Jan 14 2008 parag <paragn at fedoraproject.org> 3.5.7-2
- Merge Review #226081 Spec cleanups




Index: libXpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXpm.spec	24 Sep 2007 19:53:57 -0000	1.21
+++ libXpm.spec	14 Jan 2008 09:32:18 -0000	1.22
@@ -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 @@
 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 @@
 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 @@
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,13 +67,12 @@
 
 %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 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Mon Jan 14 2008 parag <paragn at fedoraproject.org> 3.5.7-2
+- Merge Review #226081 Spec cleanups
+
 * Mon Sep 24 2007 Adam Jackson <ajax at redhat.com> 3.5.7-1
 - libXpm 3.5.7