[condor] Minor tweaks for building on RHEL5.

Brian Bockelman bbockelm at fedoraproject.org
Fri Jun 24 03:49:10 UTC 2011


commit a3a9bf501b3e3ad9f4a8a994ca8ef7e73d77d0a3
Author: Brian Bockelman <bbockelm at cse.unl.edu>
Date:   Thu Jun 23 22:45:53 2011 -0500

    Minor tweaks for building on RHEL5.

 condor.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/condor.spec b/condor.spec
index ef440ae..8a994ec 100644
--- a/condor.spec
+++ b/condor.spec
@@ -385,6 +385,7 @@ popd
        -DWANT_HDFS:BOOL=FALSE \
        -DWANT_QUILL:BOOL=FALSE \
        -DWITH_ZLIB:BOOL=FALSE \
+       -DWITH_POSTGRESQL:BOOL=FALSE \
        -DWANT_CONTRIB:BOOL=ON \
 %if %aviary
        -DWITH_AVIARY:BOOL=TRUE \
@@ -440,7 +441,9 @@ populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libclassad.so*
 rm -f %{buildroot}/%{_datadir}/condor/libclassads.a
 mv %{buildroot}%{_datadir}/condor/lib*.so %{buildroot}%{_libdir}/
 
+%if %aviary || %qmf
 populate %{_libdir}/condor/plugins %{buildroot}/%{_usr}/libexec/*-plugin.so
+%endif
 
 # It is proper to put Condor specific libexec binaries under libexec/condor/
 populate %_libexecdir/condor %{buildroot}/usr/libexec/*
@@ -498,8 +501,9 @@ mkdir -p -m0755 %{buildroot}/%{_var}/run/condor
 mkdir -p -m0755 %{buildroot}/%{_var}/log/condor
 mkdir -p -m0755 %{buildroot}/%{_var}/lock/condor
 mkdir -p -m1777 %{buildroot}/%{_var}/lock/condor/local
-mkdir -p -m0755 %{buildroot}/%{_sharedstatedir}/condor/spool
-mkdir -p -m1777 %{buildroot}/%{_sharedstatedir}/condor/execute
+# Note we use %{_var}/lib instead of %{_sharedstatedir} for RHEL5 compatibility
+mkdir -p -m0755 %{buildroot}/%{_var}/lib/condor/spool
+mkdir -p -m1777 %{buildroot}/%{_var}/lib/condor/execute
 
 cat >> %{buildroot}/%{_sharedstatedir}/condor/condor_config.local << EOF
 CONDOR_DEVELOPERS = NONE


More information about the scm-commits mailing list