[kalzium] F21+: disable avogadro on ARM, enable facile on aarch64

[Kevin Kofler]

commit ef52f341fd75373c0ad0f1fd0570d70b9483199e
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Jan 25 22:13:03 2014 +0100

    F21+: disable avogadro on ARM, enable facile on aarch64
    
    * Sat Jan 25 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.12.1-3
    - Disable avogadro support on ARM on F21+, drop ExcludeArch added in -2
    - Enable facile support on aarch64 on F21+

 kalzium.spec |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/kalzium.spec b/kalzium.spec
index 6d6c366..85a7bc2 100644
--- a/kalzium.spec
+++ b/kalzium.spec
@@ -3,10 +3,24 @@
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
 %ifarch %{arm} %{ix86} x86_64 ppc ppc64 sparc sparcv9
-%define with_facile 1
+%global with_facile 1
+%endif
+%if 0%{?fedora} > 20
+%ifarch aarch64
+%global with_facile 1
+%endif
 %endif
 %endif
 
+%if 0%{?fedora} > 20
+# Avogadro has ExcludeArch ARM on F21+
+%ifnarch %{arm}
+%global with_avogadro 1
+%endif
+%else
+%global with_avogadro 1
+%endif
+
 Name:    kalzium
 Summary: Periodic Table of Elements 
 Version: 4.12.1
@@ -22,12 +36,9 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
-%if 0%{?fedora} > 20
-# avogadro-1.1+ has ExcludeArch: arm too
-ExcludeArch: %{arm}
-%endif
-
+%if 0%{?with_avogadro}
 BuildRequires: avogadro-devel
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libkdeedu-devel >= %{version}
@@ -137,7 +148,11 @@ fi
 
 
 %changelog
-* Sat Jan 25 2014 Rex Dieter <rdieter at fedoraproject.org> 4.12.1-2
+* Sat Jan 25 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.12.1-3
+- Disable avogadro support on ARM on F21+, drop ExcludeArch added in -2
+- Enable facile support on aarch64 on F21+
+
+* Sat Jan 25 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.1-2
 - rebuild (avogadro)
 
 * Fri Jan 10 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.1-1