From 3d3c6a6c5facca74022f1cfa0ad573255f44f413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 18 Oct 2010 09:57:11 +0100
Subject: [PATCH] Resolves: rhbz#226058 Merge-review cleanup

---
 libwmf.spec | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/libwmf.spec b/libwmf.spec
index 0a4dd6d..be729fd 100644
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,7 +1,7 @@
 Summary: Windows MetaFile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 26%{?dist}
+Release: 27%{?dist}
 Group: System Environment/Libraries
 #libwmf is under the LGPLv2+, however...
 #1. The tarball contains an old version of the urw-fonts under GPL+.
@@ -11,7 +11,6 @@ Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+ and GPL+
 Source: http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
 URL: http://wvware.sourceforge.net/libwmf.html
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Upstream is uncontactable for some time now, which is a real pity esp.
 #wrt CVE-2006-3376/CVE-2009-1364
 #Don't install out of date documentation
@@ -56,7 +55,7 @@ A library for parsing Windows MetaFile vector graphics (WMF).
 Summary: Support files necessary to compile applications with libwmf
 Group: Development/Libraries
 Requires: libwmf = %{version}-%{release}
-Requires: gtk2-devel, libxml2-devel, gd-devel, libjpeg-devel, pkgconfig
+Requires: gtk2-devel, libxml2-devel, gd-devel, libjpeg-devel
 
 %description devel
 Libraries, headers, and support files necessary to compile applications 
@@ -80,20 +79,16 @@ rm configure.ac
 ln -s patches/acconfig.h acconfig.h
 autoreconf -i -f
 %configure --with-libxml2 --disable-static --disable-dependency-tracking
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+make %{?_smp_mflags}
 dos2unix doc/caolan/*.html
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 rm -rf $RPM_BUILD_ROOT%{_includedir}/libwmf/gd
 find doc -name "Makefile*" -exec rm {} \;
+
 #we're carrying around duplicate fonts
 rm -rf $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/*afm
 rm -rf $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/*pfb
@@ -140,10 +135,11 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 %{_includedir}/libwmf
 %{_bindir}/libwmf-config
 
-%clean
-rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Oct 18 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.2.8.4-27
+- Merge-review cleanup (#226058)
+
 * Thu Jul 08 2010 Caolán McNamara <caolanm@redhat.com> - 0.2.8.4-26
 - Move docs into -lite subpackage that all the rest require to
   fulfil subpackage licencing rules