[condor] - mongodb exists only on selected arches

Dan Horák sharkcz at fedoraproject.org
Thu Aug 14 20:50:28 UTC 2014


commit e1cff47ed3da8dd43d1c8486dcb4821c92bc42d0
Author: Dan Horák <dan at danny.cz>
Date:   Thu Aug 14 22:50:32 2014 +0200

    - mongodb exists only on selected arches

 condor.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/condor.spec b/condor.spec
index 23b73cf..3e8bca7 100644
--- a/condor.spec
+++ b/condor.spec
@@ -2,10 +2,15 @@
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 %global newname         htcondor
 
+%ifarch %{arm} %{ix86} x86_64
+%global with_mongodb	1
+%endif
+
+
 #######################
 Name:           condor
 Version:        8.1.4
-Release:        5.%{shortcommit}%{?dist}
+Release:        6.%{shortcommit}%{?dist}
 Summary:        Condor: High Throughput Computing
 License:        ASL 2.0
 Group:          Applications/System
@@ -72,7 +77,7 @@ BuildRequires: libdeltacloud-devel
 BuildRequires: wso2-wsf-cpp-devel
 BuildRequires: wso2-axis2-devel
 # support for plumage
-%ifnarch aarch64
+%if 0%{?with_mongodb}
 BuildRequires: mongodb-devel
 %endif
 # support for cream (glite-ce-cream-client-devel doesn't exist in Fedora)
@@ -157,7 +162,7 @@ Requires: condor-aviary-hadoop-common = %{version}-%{release}
 Aviary Hadoop plugin and components.
 
 #######################
-%ifnarch aarch64
+%if 0%{?with_mongodb}
 %package plumage
 Summary: HTCondor Plumage components
 Group: Applications/System
@@ -322,7 +327,7 @@ cp %{SOURCE2} %{name}.service
        -DWITH_BOSCO:BOOL=FALSE \
        -DWITH_PIGEON:BOOL=FALSE \
        -DWITH_MANAGEMENT:BOOL=FALSE \
-%ifnarch aarch64
+%if 0%{?with_mongodb}
        -DWITH_PLUMAGE:BOOL=TRUE \
 %endif
        -DWITH_AVIARY:BOOL=TRUE \
@@ -403,7 +408,7 @@ populate %{_var}/lib/condor/aviary %{buildroot}/usr/services/
 populate %{_libdir}/condor/plugins %{buildroot}/%{_usr}/libexec/condor/*-plugin.so
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libaviary_*
 
-%ifnarch aarch64
+%if 0%{?with_mongodb}
 # Install condor-plumage's base plugin configuration
 populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/62plumage.config
 %endif
@@ -808,7 +813,7 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_datadir/condor/aviary/mapred_tasktracker.sh
 
 #################
-%ifnarch aarch64
+%if 0%{?with_mongodb}
 %files plumage
 %doc LICENSE-2.0.txt NOTICE.txt
 %_sysconfdir/condor/config.d/62plumage.config
@@ -943,6 +948,9 @@ echo "*********** Verify NMI status is all GREEN ***********"
 /sbin/ldconfig
 
 %changelog
+* Thu Aug 14 2014 Dan Horák <dan[at]danny.cz> - 8.1.4-6.a1a7df5
+- mongodb exists only on selected arches
+
 * Sun Jun 29 2014 Peter Robinson <pbrobinson at fedoraproject.org> 8.1.4-5.a1a7df5
 - don't build plumage on aarch64 as we don't (yet) have v8/mongodb
 


More information about the scm-commits mailing list