[GraphicsMagick] Bad font configuration (#783906)

[Rex Dieter]

commit 2271f534cdc180f10c4adf75631eb78a1f66e398
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 23 11:39:44 2012 -0600

    Bad font configuration (#783906)
    
    - re-introduce perl_linkage patch, fixes %check

 GraphicsMagick-1.3.13-perl_linkage.patch |   12 ++++++++++++
 GraphicsMagick.spec                      |   19 +++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/GraphicsMagick-1.3.13-perl_linkage.patch b/GraphicsMagick-1.3.13-perl_linkage.patch
new file mode 100644
index 0000000..89bf4b9
--- /dev/null
+++ b/GraphicsMagick-1.3.13-perl_linkage.patch
@@ -0,0 +1,12 @@
+diff -up GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in
+--- GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in.perl_linkage	2011-12-24 13:34:16.000000000 -0600
++++ GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in	2012-01-23 10:09:16.435774518 -0600
+@@ -79,7 +79,7 @@ WriteMakefile
+    'INSTALLBIN'	=> $magick_BIN_DIR,
+ 
+    # Library specification
+-   'LIBS'	=> ["-L$magick_LIB_DIR -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS $magick_OMP_LIBS"],
++   'LIBS'	=> ["-L$magick_LIB_DIR -L../magick/.libs -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS $magick_OMP_LIBS"],
+ 
+    # Perl binary name (if a Perl binary is built)
+    'MAP_TARGET'	=> 'PerlMagick',
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 7fb10cf..2e7dfe6 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -7,13 +7,16 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
 Url: http://www.graphicsmagick.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+## upstreamable patches
+Patch50: GraphicsMagick-1.3.13-perl_linkage.patch
+
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: jasper-devel
@@ -34,6 +37,10 @@ BuildRequires: zlib-devel
 ## FIXME: %%check stuff
 #BuildRequires: xorg-x11-server-Xvfb
 
+# depend on stuff referenced below
+# --with-gs-font-dir=%{_datadir}/fonts/default/Type1
+Requires: urw-fonts
+
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
 based on ImageMagick 5.5.2, but which has undergone significant re-work by
@@ -102,6 +109,8 @@ however.
 %prep
 %setup -q
 
+%patch50 -p1 -b .perl_linkage
+
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
@@ -127,7 +136,6 @@ sed -i -e "s|BrowseDelegateDefault=.*|BrowseDelegateDefault=\'xdg-open\'|" confi
            --with-xml \
            --without-dps \
            --without-gslib \
-           --with-windows-font-dir=%{_datadir}/fonts/msttcorefonts \
            --with-gs-font-dir=%{_datadir}/fonts/default/Type1
 
 make %{?_smp_mflags}
@@ -196,8 +204,7 @@ EOF
 
 
 %check
-make check  ||:
-make check-perl ||:
+make check #|| cat PerlMagick/PerlMagickCheck.log ; make check-perl
 
 
 %clean
@@ -256,6 +263,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 23 2012 Rex Dieter <rdieter at fedoraproject.org> 1.3.13-2
+- Bad font configuration (#783906)
+- re-introduce perl_linkage patch, fixes %%check
+
 * Thu Jan 12 2012 Rex Dieter <rdieter at fedoraproject.org> 1.3.13-1
 - 1.3.13