[fltk] fltk-config inconsistency on ARM (#733421)

[Rex Dieter]

commit c0d7d96199c5919bf9732460fab83b5086d33913
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 25 13:10:15 2011 -0500

    fltk-config inconsistency on ARM (#733421)

 fltk-config.sh |    2 +-
 fltk.spec      |   15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/fltk-config.sh b/fltk-config.sh
index 331556a..c70522d 100644
--- a/fltk-config.sh
+++ b/fltk-config.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec fltk-config-$(arch) "$@"
+exec fltk-config-$(uname -i) "$@"
diff --git a/fltk.spec b/fltk.spec
index 25e113d..6aa4a98 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,13 +1,11 @@
 
-%global arch %(arch 2>/dev/null || echo undefined)
-
 # TODO:
 # *  port .spec to use cmake
 
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -112,10 +110,13 @@ make install install-desktop DESTDIR=$RPM_BUILD_ROOT
 make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
 rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
 
-# hack to make fltk-config multilib-safe
+# we only apply this hack to multilib arch's
+%ifarch x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
+%global arch %(uname -i 2>/dev/null || echo undefined)
 mv $RPM_BUILD_ROOT%{_bindir}/fltk-config \
    $RPM_BUILD_ROOT%{_bindir}/fltk-config-%{arch}
 install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fltk-config
+%endif
 
 # docs
 rm -rf __docs
@@ -160,9 +161,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %files devel
 %defattr(-,root,root,-)
 %doc __docs/*
-# fltk-config multilib-safe wrapper
 %{_bindir}/fltk-config
-%{_bindir}/fltk-config-%{arch}
+%{?arch:%{_bindir}/fltk-config-%{arch}}
 %{_includedir}/FL/
 %{_includedir}/Fl
 %{_libdir}/libfltk.so
@@ -190,6 +190,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Aug 25 2011 Rex Dieter <rdieter at fedoraproject.org> 1.3.0-2
+- fltk-config inconsistency on ARM (#733421)
+
 * Fri Jun 24 2011 Rex Dieter <rdieter at fedoraproject.org> 1.3.0-1
 - 1.3.0 (final)
 - --with-links