diff --git a/condor.spec b/condor.spec index 274e2ea..df4f89b 100644 --- a/condor.spec +++ b/condor.spec @@ -31,14 +31,14 @@ # Things not turned on, or don't have Fedora packages yet %define blahp 1 %define glexec 1 -%define cream 0 +%define cream 1 # These flags are meant for developers; it allows one to build Condor # based upon a git-derived tarball, instead of an upstream release tarball %define git_build 1 # If building with git tarball, Fedora requests us to record the rev. Use: # git log -1 --pretty=format:'%h' -%define git_rev 537ccb1 +%define git_rev ce12f50 %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -48,7 +48,7 @@ Summary: Condor: High Throughput Computing Name: condor Version: %{tarball_version} -%define condor_base_release 0.4 +%define condor_base_release 0.6 %if %git_build %define condor_release %condor_base_release.%{git_rev}.git %else @@ -127,6 +127,7 @@ Patch9: 0001-Apply-the-user-s-condor_config-last-rather-than-firs.patch Patch11: condor_oom_v3.patch # From ZKM #Patch12: zkm-782.patch +Patch12: cream_sl6_build.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -438,6 +439,7 @@ exit 0 %patch9 -p1 #%patch10 -p1 %patch11 -p1 +%patch12 -p1 %if %systemd cp %{SOURCE2} %{name}-tmpfiles.conf @@ -1164,6 +1166,12 @@ fi %endif %changelog +* Thu Dec 6 2012 Brian Bockelman - 7.9.3-0.6.ce12f50.git +- Fix compile for CREAM. + +* Thu Dec 6 2012 Brian Bockelman - 7.9.3-0.5.ce12f50.git +- Merge code which has improved blahp file cleanup. + * Tue Oct 30 2012 Brian Bockelman - 7.9.2-0.2.b714b0e.git - Re-up to the latest master. - Add support for syslog. diff --git a/cream_sl6_build.patch b/cream_sl6_build.patch new file mode 100644 index 0000000..debc220 --- /dev/null +++ b/cream_sl6_build.patch @@ -0,0 +1,11 @@ +--- a/externals/bundles/cream/1.12.1_14/CMakeLists.txt ++++ b/externals/bundles/cream/1.12.1_14/CMakeLists.txt +@@ -250,7 +250,7 @@ if ( NOT PROPER ) + + else( NOT PROPER ) + +- if ( ${SYSTEM_NAME} MATCHES "rhel6" OR ${SYSTEM_NAME} MATCHES "centos6") ++ if ( ${SYSTEM_NAME} MATCHES "rhel6" OR ${SYSTEM_NAME} MATCHES "centos6" OR ${SYSTEM_NAME} MATCHES "sl6") + find_multiple("glite_ce_cream_client_soap;glite_ce_cream_client_util;glite_security_gsoap_plugin_2716_cxx;glite_security_gss;gridsite" CREAM_FOUND ) + else() + find_multiple("glite_ce_cream_client_soap;glite_ce_cream_client_util;glite_security_gsoap_plugin_2713_cxx;glite_security_gss;gridsite" CREAM_FOUND )