From ccd900696dd8a29cf962fa9eff762b4ed920d1be Mon Sep 17 00:00:00 2001 From: Brian Bockelman Date: Oct 26 2011 05:26:43 +0000 Subject: Merged 7.7.3 prerelease. --- diff --git a/.gitignore b/.gitignore index a01ee28..0e0fc6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .*.swp +/condor-7.7.3-c39a8b84-GIT.tar.gz diff --git a/condor.spec b/condor.spec index 69da730..ff07ced 100644 --- a/condor.spec +++ b/condor.spec @@ -4,12 +4,14 @@ %if 0%{?fedora} >= 15 %define deltacloud 1 %define aviary 1 +%define plumage 1 %define systemd 1 %define cgroups 1 %define qmf 1 %else %define deltacloud 0 %define aviary 0 +%define plumage 0 %define systemd 0 %define cgroups 0 %define qmf 0 @@ -77,8 +79,9 @@ Source0: condor.tar.gz # git archive --format=tar --prefix=condor-7.7.1/ V7_7_1 | gzip >condor_src-7.7.1-all-all.tar.gz # # ecafed3e183e9fc6608dc9e55e4dd59b condor_src-7.7.1-all-all.tar.gz +# 6a7a42515d5ae6c8cb3c69492697e04f condor_src-7.7.3-all-all.tar.gz # Note: The md5sum of each generated tarball may be different -Source0: condor_src-7.7.2-all-all.tar.gz +Source0: condor-7.7.3-c39a8b84-GIT.tar.gz Source1: generate-tarball.sh %endif @@ -149,6 +152,10 @@ BuildRequires: wso2-wsf-cpp-devel BuildRequires: wso2-axis2-devel %endif +%if %plumage +BuildRequires: mongodb-devel >= 1.6.4-3 +%endif + %if %cgroups BuildRequires: libcgroup-devel >= 0.37 Requires: libcgroup >= 0.37 @@ -241,6 +248,20 @@ Requires: condor-classads = %{version}-%{release} Components to provide simplified WS interface to Condor. %endif +%if %plumage +%package plumage +Summary: Condor Plumage components +Group: Applications/System +Requires: %name = %version-%release +Requires: condor-classads = %{version}-%{release} +Requires: mongodb >= 1.6.4 +Requires: pymongo >= 1.9 +Requires: python-dateutil >= 1.4.1 + +%description plumage +Components to provide a NoSQL operational data store for Condor. +%endif + ####################### %package kbdd Summary: Condor Keyboard Daemon @@ -357,6 +378,11 @@ find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \; -DWITH_ZLIB:BOOL=FALSE \ -DWITH_POSTGRESQL:BOOL=FALSE \ -DWANT_CONTRIB:BOOL=ON \ +%if %plumage + -DWITH_PLUMAGE:BOOL=TRUE \ +%else + -DWITH_PLUMAGE:BOOL=FALSE \ +%endif %if %aviary -DWITH_AVIARY:BOOL=TRUE \ %else @@ -410,6 +436,7 @@ populate %_sysconfdir/condor %{buildroot}/%{_usr}/lib/condor_ssh_to_job_sshd_con populate %{_datadir}/condor %{buildroot}/%{_usr}/lib/* # Except for the shared libs populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libclassad.so* +populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libcondor_utils.so rm -f %{buildroot}/%{_datadir}/condor/libclassad.a %if %aviary || %qmf @@ -460,6 +487,14 @@ populate %{_var}/lib/condor/aviary %{buildroot}/usr/axis2.xml populate %{_var}/lib/condor/aviary %{buildroot}/usr/services/ %endif +%if %plumage +# Install condor-plumage's base plugin configuration +populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/62plumage.config +rm -f %{buildroot}/%{_bindir}/ods_job_etl_tool +rm -f %{buildroot}/%{_sbindir}/ods_job_etl_server +mkdir -p -m0755 %{buildroot}/%{_var}/lib/condor/ViewHist +%endif + mkdir -p -m0755 %{buildroot}/%{_var}/run/condor mkdir -p -m0755 %{buildroot}/%{_var}/log/condor mkdir -p -m0755 %{buildroot}/%{_var}/lock/condor @@ -548,6 +583,7 @@ rm -rf %{buildroot}%{_sbindir}/uniq_pid_undertaker rm -rf %{buildroot}%{_datadir}/condor/Execute.pm rm -rf %{buildroot}%{_datadir}/condor/ExecuteLock.pm rm -rf %{buildroot}%{_datadir}/condor/FileLock.pm +rm -rf %{buildroot}%{_datadir}/condor/Condor.pm rm -rf %{buildroot}%{_usrsrc}/chirp/chirp_* rm -rf %{buildroot}%{_usrsrc}/startd_factory rm -rf %{buildroot}/usr/DOC @@ -571,7 +607,7 @@ rm -rf %{buildroot}%{_includedir}/user_log.README rm -rf %{buildroot}%{_includedir}/user_log.c++.h rm -rf %{buildroot}%{_includedir}/write_user_log.h rm -rf %{buildroot}%{_libexecdir}/condor/bgp_* -rm -rf %{buildroot}%{_datadir}/condor/libchirp_client.a +rm -rf %{buildroot}%{_datadir}/condor/libchirp_client.* rm -rf %{buildroot}%{_datadir}/condor/libcondorapi.a %clean @@ -600,7 +636,8 @@ rm -rf %{buildroot} %_datadir/condor/Chirp.jar %_datadir/condor/CondorJavaInfo.class %_datadir/condor/CondorJavaWrapper.class -%_datadir/condor/Condor.pm +# dep problem in 7.7.3 +#%_datadir/condor/Condor.pm %_datadir/condor/scimark2lib.jar %_datadir/condor/gt4-gahp.jar %_datadir/condor/gt42-gahp.jar @@ -670,6 +707,8 @@ rm -rf %{buildroot} %_mandir/man1/condor_version.1.gz %_mandir/man1/condor_wait.1.gz %_mandir/man1/condor_router_history.1.gz +%_mandir/man1/condor_continue.1.gz +%_mandir/man1/condor_suspend.1.gz %_mandir/man1/condor_router_q.1.gz %_mandir/man1/condor_ssh_to_job.1.gz %_mandir/man1/condor_power.1.gz @@ -677,6 +716,7 @@ rm -rf %{buildroot} %_mandir/man1/condor_continue.1.gz %_mandir/man1/condor_suspend.1.gz # bin/condor is a link for checkpoint, reschedule, vacate +%_libdir/libcondor_utils.so %_bindir/condor %_bindir/condor_submit_dag %_bindir/condor_prio @@ -711,10 +751,10 @@ rm -rf %{buildroot} %_bindir/condor_ssh_to_job %_bindir/condor_power %_bindir/condor_gather_info -%_bindir/condor_test_match -%_bindir/condor_glidein %_bindir/condor_continue %_bindir/condor_suspend +%_bindir/condor_test_match +%_bindir/condor_glidein # sbin/condor is a link for master_off, off, on, reconfig, # reconfig_schedd, restart %_sbindir/condor @@ -792,6 +832,22 @@ rm -rf %{buildroot} %dir %_libdir/condor/plugins %_libdir/condor/plugins/AviaryScheddPlugin-plugin.so %_sbindir/aviary_query_server +%dir %_datadir/condor/aviary +%_datadir/condor/aviary/jobcontrol.py* +%_datadir/condor/aviary/jobquery.py* +%_datadir/condor/aviary/submissions.py* +%_datadir/condor/aviary/submit.py* +%_datadir/condor/aviary/setattr.py* +%dir %_datadir/condor/aviary/dag +%_datadir/condor/aviary/dag/diamond.dag +%_datadir/condor/aviary/dag/dag-submit.py* +%_datadir/condor/aviary/dag/job.sub +%dir %_datadir/condor/aviary/module +%_datadir/condor/aviary/module/aviary/util.py* +%_datadir/condor/aviary/module/aviary/https.py* +%_datadir/condor/aviary/module/aviary/__init__.py* +%_datadir/condor/aviary/README +%defattr(-,condor,condor,-) %dir %_var/lib/condor/aviary %_var/lib/condor/aviary/axis2.xml %dir %_var/lib/condor/aviary/services @@ -809,6 +865,20 @@ rm -rf %{buildroot} %_var/lib/condor/aviary/services/query/aviary-query.wsdl %endif +%if %plumage +%files plumage +%defattr(-,root,root,-) +%doc LICENSE-2.0.txt NOTICE.txt +%_sysconfdir/condor/config.d/62plumage.config +%dir %_libdir/condor/plugins +%_libdir/condor/plugins/ODSCollectorPlugin-plugin.so +%dir %_datadir/condor/plumage +%_bindir/plumage_stats +%_datadir/condor/plumage/README +%defattr(-,condor,condor,-) +%dir %_var/lib/condor/ViewHist +%endif + ################# %files kbdd %defattr(-,root,root,-) @@ -931,8 +1001,8 @@ fi %endif %changelog -* Fri Sep 30 2011 Brian Bockelman - 7.7.1-0.2 -- Enable glexec builds. +* Tue Oct 25 2011 - 7.7.3-0.1 +- Fast forward to 7.7.3 pre release * Fri Sep 16 2011 - 7.7.1-0.1 - Fast forward to 7.7.1 official release tag V7_7_1 diff --git a/sources b/sources index 8fb7772..3dd54eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d6214c105d697dc6e01699fdbb63d4 condor-7.7.1-UPSTREAM-GT.tar.gz +30da64ba2567cd9e0ece868f8886a7dd condor-7.7.3-c39a8b84-GIT.tar.gz