[kalzium] Fix ARM build by fine-tuning with_avogadro

Kevin Kofler kkofler at fedoraproject.org
Sat Jan 25 22:09:51 UTC 2014


commit f594e4d191d99416792d0b01d0ff58f054e6e17e
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Jan 25 23:09:10 2014 +0100

    Fix ARM build by fine-tuning with_avogadro
    
    * libcompoundviewer is only built with Avogadro support enabled.
    * Eigen2 is only used for the compound viewer, so no use BRing it
      without Avogadro.
    
    (Note: Despite what the feature report in build.log claims, OpenBabel is
    also used in other optional parts, so keep that one.)

 kalzium.spec |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/kalzium.spec b/kalzium.spec
index 92f14a1..64053f5 100644
--- a/kalzium.spec
+++ b/kalzium.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:    kalzium
-Summary: Periodic Table of Elements 
+Summary: Periodic Table of Elements
 Version: 4.12.1
 Release: 3%{?dist}
 
@@ -36,19 +36,23 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
-%if 0%{?with_avogadro}
-BuildRequires: avogadro-devel
-%endif
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libkdeedu-devel >= %{version}
+# build.log says that OpenBabel is for the "3D-molecule viewer", but it is also
+# used in other optional components than the Avogadro-based compound viewer.
+BuildRequires: pkgconfig(openbabel-2.0)
+BuildRequires: python-devel python
+%if 0%{?with_avogadro}
+# Eigen is only used for the Avogadro-based compound viewer.
+BuildRequires: pkgconfig(eigen2)
+BuildRequires: avogadro-devel
+%endif
 %if 0%{?with_facile}
+# OCaml is only used with the Facile library, in the equation balancer.
 BuildRequires: ocaml(compiler)
 BuildRequires: ocaml-facile-devel
 %endif
-BuildRequires: pkgconfig(eigen2)
-BuildRequires: pkgconfig(openbabel-2.0)
-BuildRequires: python-devel python
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
@@ -138,12 +142,16 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %files libs
+%if 0%{?with_avogadro}
 %{_kde4_libdir}/libcompoundviewer.so.4*
+%endif
 %{_kde4_libdir}/libscience.so.4*
 
 %files devel
 %{_kde4_includedir}/libkdeedu/*.h
+%if 0%{?with_avogadro}
 %{_kde4_libdir}/libcompoundviewer.so
+%endif
 %{_kde4_libdir}/libscience.so
 
 


More information about the scm-commits mailing list