From e327eaff6ea4cdcdb6d9d24c901f562ad0537059 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Wed, 26 Jun 2013 08:53:44 -0500
Subject: [PATCH] GraphicsMagick needs to recognize aarch64 as 64bit arch
 (#978351)

---
 GraphicsMagick.spec | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index fa19cc0..1cf9524 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -14,10 +14,19 @@
 %global libQ -Q16
 %endif
 
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
+# hack for older platforms/rpm-versions that do not support %%__isa_bits (like el5)
+%if ! 0%{?__isa_bits:1}
+%ifarch x86_64 s390x ia64 ppc64 sparc64
+%global __isa_bits 64
+%else
+%global __isa_bits 32
+%endif
+
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: MIT
 Group: Applications/Multimedia
@@ -190,14 +199,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
 rm -vf  %{buildroot}%{_libdir}/lib*.la
 
 # fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64 sparc64
-%define wordsize 64
-%else
-%define wordsize 32
-%endif
-
+%ifarch %{multilib_archs}
 mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h \
-   %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types-%{wordsize}.h
+   %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types-%{__isa_bits}.h
 
 cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h <<EOF
 #ifndef MAGICK_TYPES_MULTILIB
@@ -215,10 +219,18 @@ cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h <<EOF
 
 #endif
 EOF
+%endif
 
 
 %check
 make check ||:
+# multilib hack only supports 32/64 bits for now
+%ifarch %{multilib_archs}
+%if ! (%{__isa_bits} == 32 || %{__isa_bits} == 64)
+echo "multilib hack currently only supports 64/32 bits, not %{__isa_bits} (yet)"
+exit 1
+%endif
+%endif
 
 
 %clean
@@ -277,6 +289,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 26 2013 Rex Dieter <rdieter@fedoraproject.org> 1.3.18-2
+- GraphicsMagick needs to recognize aarch64 as 64bit arch (#978351)
+
 * Mon Mar 11 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.3.18-1
 - 1.3.18 (#920064)
 - add %%rhel conditionals