[ImageMagick] use %{__isa_bits} set by platform, instead of hardcoding the list of 64-bit arches
Kyle McMartin
kyle at fedoraproject.org
Fri Nov 8 17:19:32 UTC 2013
commit 01ea42536f5010ac539b6430ebe4f82768457a12
Author: Kyle McMartin <kyle at mcmartin.ca>
Date: Fri Nov 8 12:14:44 2013 -0500
use %{__isa_bits} set by platform, instead of hardcoding the list of 64-bit arches
ImageMagick.spec | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 63b79c6..51f7d0f 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -202,14 +202,9 @@ if [ -z perl-pkg-files ] ; then
fi
# fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64 alpha sparc64 aarch64
-%define wordsize 64
-%else
-%define wordsize 32
-%endif
mv %{buildroot}%{_includedir}/%{name}-6/magick/magick-config.h \
- %{buildroot}%{_includedir}/%{name}-6/magick/magick-config-%{wordsize}.h
+ %{buildroot}%{_includedir}/%{name}-6/magick/magick-config-%{__isa_bits}.h
cat >%{buildroot}%{_includedir}/%{name}-6/magick/magick-config.h <<EOF
#ifndef IMAGEMAGICK_MULTILIB
@@ -319,6 +314,9 @@ rm -rf %{buildroot}
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
+* Fri Nov 08 2013 Kyle McMartin <kyle at fedoraproject.org>
+- Use %__isa_bits instead of hardcoding the list of 64-bit architectures.
+
* Mon Oct 7 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.7.0-1
- Update to 6.8.7-0 to fix badurl (http://www.mail-archive.com/devel@lists.fedoraproject.org/msg67796.html)
More information about the scm-commits
mailing list