[condor] Small fixes in the specfile found in doing RHEL5 mock-builds.

[Brian Bockelman]

commit e23d21b31cb2a8fd547bccd787dbf4407f2b2ede
Author: Brian Bockelman <bbockelm at cse.unl.edu>
Date:   Wed Jul 6 11:09:10 2011 -0500

    Small fixes in the specfile found in doing RHEL5 mock-builds.

 cmake_26.patch |   13 +++++++++++++
 condor.spec    |   38 ++++++++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)
---
diff --git a/cmake_26.patch b/cmake_26.patch
new file mode 100644
index 0000000..15da9ee
--- /dev/null
+++ b/cmake_26.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78e4dc2..0233c49 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ ##########################################################################
+ # Set project
+ project(CONDOR)
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 2.6)
+ 
+ ##########################################################################
+ #Setup package meta-data (used in packaging)
diff --git a/condor.spec b/condor.spec
index 41664f7..87da159 100644
--- a/condor.spec
+++ b/condor.spec
@@ -19,6 +19,7 @@
 # Things not turned on, or don't have Fedora packages yet
 %define blahp 0
 %define qmf 0
+%define shared 0
 
 # These flags are meant for developers; it allows one to build Condor
 # based upon a git-derived tarball, instead of an upstream release tarball
@@ -35,6 +36,13 @@
 %define include_man 0
 %endif
 
+# Special patches must be applied only to RHEL5
+%if 0%{?el5}
+%define rhel5 1
+%else
+%define rhel5 0
+%endif
+
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.7.0
@@ -104,12 +112,17 @@ Patch3: chkconfig_off.patch
 %if !%git_build
 Patch4: 7.7.0-catch-up.patch
 %endif
+%if %shared
 Patch5: condor_shared_libs.patch
+%endif
+
+%if %rhel5
+Patch6: cmake_26.patch
+%endif
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-# Explicitly request cmake >= 2.8.0, as this is not generally available on RHEL5 platforms
-BuildRequires: cmake >= 2.8.0
+BuildRequires: cmake
 BuildRequires: %_bindir/flex
 BuildRequires: %_bindir/byacc
 BuildRequires: pcre-devel
@@ -355,7 +368,12 @@ exit 0
 %patch4 -p1
 %endif
 %patch0 -p1
+%if %shared
 %patch5 -p1
+%endif
+%if %rhel5
+%patch6 -p1
+%endif
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -441,7 +459,9 @@ populate %{_datadir}/condor %{buildroot}/%{_usr}/lib/*
 # Except for the shared libs
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libclassad.so*
 rm -f %{buildroot}/%{_datadir}/condor/libclassads.a
+%if %shared
 mv %{buildroot}%{_datadir}/condor/lib*.so %{buildroot}%{_libdir}/
+%endif
 
 %if %aviary || %qmf
 populate %{_libdir}/condor/plugins %{buildroot}/%{_usr}/libexec/*-plugin.so
@@ -507,7 +527,7 @@ mkdir -p -m1777 %{buildroot}/%{_var}/lock/condor/local
 mkdir -p -m0755 %{buildroot}/%{_var}/lib/condor/spool
 mkdir -p -m1777 %{buildroot}/%{_var}/lib/condor/execute
 
-cat >> %{buildroot}/%{_sharedstatedir}/condor/condor_config.local << EOF
+cat >> %{buildroot}/%_var/lib/condor/condor_config.local << EOF
 CONDOR_DEVELOPERS = NONE
 CONDOR_HOST = \$(FULL_HOSTNAME)
 COLLECTOR_NAME = Personal Condor
@@ -520,7 +540,7 @@ NEGOTIATOR_INTERVAL = 20
 EOF
 
 # this gets around a bug whose fix is not yet merged
-echo "TRUST_UID_DOMAIN = TRUE" >> %{buildroot}/%{_sharedstatedir}/condor/condor_config.local
+echo "TRUST_UID_DOMAIN = TRUE" >> %{buildroot}/%_var/lib/condor/condor_config.local
 
 # no master shutdown program for now
 rm %{buildroot}/%{_sbindir}/condor_set_shutdown
@@ -743,6 +763,9 @@ rm -rf %{buildroot}
 %_sbindir/condor_store_cred
 %_sbindir/condor_transferd
 %_sbindir/condor_updates_stats
+%if %gsoap
+%_sbindir/amazon_gahp
+%endif
 %_sbindir/ec2_gahp
 %_sbindir/condor_gridmanager
 %_sbindir/condor_gridshell
@@ -751,7 +774,9 @@ rm -rf %{buildroot}
 %_sbindir/nordugrid_gahp
 %_sbindir/gt4_gahp
 %_sbindir/gt42_gahp
+%if %shared
 %_libdir/lib*.so
+%endif
 #%_sbindir/condor_credd
 %config(noreplace) %_var/lib/condor/condor_config.local
 %defattr(-,condor,condor,-)
@@ -847,7 +872,12 @@ rm -rf %{buildroot}
 %doc LICENSE-2.0.txt NOTICE.txt
 %_libdir/libclassad.so.1
 %_libdir/libclassad.so.1.1.0
+# That's right; the internal library that Condor statically linked against
+# is called classads, while the exported one is classad.  Hopefully this
+# is resolved as the shared lib work is upstreamed.  For now, we deal.
+%if %shared
 %_libdir/libclassads.so
+%endif
 
 %files classads-devel
 %defattr(-,root,root,-)