From 78d8e8e20e9c124f63279a70b86764f844a44385 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 6 Nov 2009 14:33:47 +0000
Subject: [PATCH] - cleanup/uncruftify .spec

---
 GraphicsMagick.spec | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 3d1cdaf..ffd55f5 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -2,7 +2,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
@@ -101,27 +101,24 @@ mv -f ChangeLog.utf8 ChangeLog
 
 # Avoid lib64 rpaths (FIXME: recheck this on newer releases)
 %if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
 
 %build
-%configure --enable-shared \
+%configure --enable-shared --disable-static \
+           --with-lcms \
+           --with-magick_plus_plus \
            --with-modules \
            --with-perl \
-           --with-x \
+           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \
            --with-threads \
-           --with-magick_plus_plus \
-           --without-gslib \
+           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
            --with-wmf \
-           --with-lcms \
+           --with-x \
            --with-xml \
-           --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
-           --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
-           --without-dps
-
-# Avoid bogus RPATHs on x86_64
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+           --without-dps \
+           --without-gslib
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} perl-build
@@ -136,9 +133,9 @@ make install DESTDIR=%{buildroot} -C PerlMagick
 # perlmagick: fix perl path of demo files
 %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
 
-find %{buildroot} -name "*.bs" |xargs rm -f
-find %{buildroot} -name ".packlist" |xargs rm -f
-find %{buildroot} -name "perllocal.pod" |xargs rm -f
+find %{buildroot} -name "*.bs" |xargs rm -fv
+find %{buildroot} -name ".packlist" |xargs rm -fv
+find %{buildroot} -name "perllocal.pod" |xargs rm -fv
 
 chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so
 
@@ -158,9 +155,7 @@ fi
 rm -rf %{buildroot}%{_datadir}/GraphicsMagick
 # Keep config
 rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
-rm -rf %{buildroot}%{_libdir}/libltdl.*
-rm -f  %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
-rm -f  %{buildroot}%{_libdir}/*.{a,la}
+rm -vf  %{buildroot}%{_libdir}/lib*.la
 
 # fix multilib issues
 %ifarch x86_64 s390x ia64 ppc64 sparc64
@@ -247,6 +242,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 06 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.3.7-2
+- cleanup/uncruftify .spec
+
 * Thu Sep 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.3.7-1
 - GraphicsMagick-1.3.7