From 1ebbe5cf687e21e36c1f1b75f6bc89e7274f0492 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 7 Sep 2010 11:38:50 -0500
Subject: [PATCH] Merge review cleanup

- Merge-review cleanup (#226004)
---
 libfontenc.spec | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/libfontenc.spec b/libfontenc.spec
index a68e997..7072e37 100644
--- a/libfontenc.spec
+++ b/libfontenc.spec
@@ -1,14 +1,11 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-
 Patch0: libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch
 
 BuildRequires: pkgconfig
@@ -27,8 +24,6 @@ Summary: X.Org X11 libfontenc development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
 X.Org X11 libfontenc development package
 
@@ -40,35 +35,25 @@ X.Org X11 libfontenc development package
 %define with_static 0
 
 %build
-# FIXME: libfontenc-0.99.2-use-datadir-for-encodings.patch requires that
-# aclocal, automake, and autoconf get invoked to activate the changes.
-# These can be removed once the patch is no longer necessary.
-#aclocal
-#automake
 autoconf
 %configure \
 %if ! %{with_static}
 	--disable-static
 %endif
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Remove all libtool archives (*.la)
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc COPYING README ChangeLog
 %{_libdir}/libfontenc.so.1
 %{_libdir}/libfontenc.so.1.0.0
 
@@ -82,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Tue Sep 07 2010 Parag Nemade <paragn AT fedoraproject.org> 1.0.5-3
+- Merge-review cleanup (#226004)
+
 * Fri Aug 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.0.5-2
 - libfontenc-1.0.0-get-fontdir-from-pkgconfig.patch: rebase to 1.0.5.