diff --git a/condor.spec b/condor.spec index ee8bab2..199b15a 100644 --- a/condor.spec +++ b/condor.spec @@ -89,8 +89,6 @@ BuildRequires: globus-ftp-client-devel BuildRequires: globus-ftp-control-devel BuildRequires: libtool-ltdl-devel BuildRequires: voms-devel -# support for deltacloud... may go away -BuildRequires: libdeltacloud-devel # support for aviary %if 0%{?with_aviary} BuildRequires: wso2-wsf-cpp-devel @@ -225,17 +223,6 @@ HTCondor. The VM Universe uses libvirt to start and control VMs under HTCondor's Startd. ####################### -%package deltacloud-gahp -Summary: HTCondor's Deltacloud Gahp -Group: Applications/System -Requires: %name = %version-%release -Requires: condor = %{version}-%{release} - -%description deltacloud-gahp -The deltacloud_gahp enables HTCondor's ability to manage jobs run on -resources exposed by the deltacloud API. - -####################### %package openstack-gahp Summary: HTCondor's OpenStack Gahp Group: Applications/System @@ -342,6 +329,7 @@ exit 0 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE1} %{name}-tmpfiles.conf cp %{SOURCE2} %{name}.service cp %{SOURCE3} . @@ -572,6 +560,7 @@ rm -rf %{buildroot}/etc/examples %files %doc LICENSE-2.0.txt NOTICE.txt +%_sysconfdir/bash_completion.d/condor %dir %_sysconfdir/condor/ %config(noreplace) %_sysconfdir/condor/condor_config %config(noreplace) %{_tmpfilesdir}/%{name}.conf @@ -677,6 +666,7 @@ rm -rf %{buildroot}/etc/examples %_mandir/man1/condor_urlfetch.1.gz %_mandir/man1/condor_job_router_info.1.gz %_mandir/man1/condor_update_machine_ad.1.gz +%_mandir/man1/condor_transform_ads.1.gz # bin/condor is a link for checkpoint, reschedule, vacate %_libdir/libcondor_utils*.so %_libexecdir/condor/panda-plugin.so @@ -705,6 +695,8 @@ rm -rf %{buildroot}/etc/examples %_bindir/condor_vacate_job %_bindir/condor_findhost %_bindir/condor_stats +%_bindir/condor_top.pl +%_bindir/condor_transform_ads %_bindir/condor_version %_bindir/condor_history %_bindir/condor_status @@ -725,6 +717,7 @@ rm -rf %{buildroot}/etc/examples %_bindir/condor_job_router_info %_bindir/condor_update_machine_ad %_sbindir/condor_advertise +%_sbindir/condor_aklog %_sbindir/condor_c-gahp %_sbindir/condor_c-gahp_worker_thread %_sbindir/condor_collector @@ -896,11 +889,6 @@ rm -rf %{buildroot}/etc/examples %_libexecdir/condor/libvirt_simple_script.awk ################# -%files deltacloud-gahp -%doc LICENSE-2.0.txt NOTICE.txt -%_sbindir/deltacloud_gahp - -################# %files openstack-gahp %doc LICENSE-2.0.txt NOTICE.txt %_sbindir/openstack_gahp @@ -932,6 +920,8 @@ rm -rf %{buildroot}/etc/examples %_includedir/classad/exprList.h %_includedir/classad/exprTree.h %_includedir/classad/fnCall.h +%_includedir/classad/jsonSink.h +%_includedir/classad/jsonSource.h %_includedir/classad/indexfile.h %_includedir/classad/lexer.h %_includedir/classad/lexerSource.h @@ -1009,6 +999,8 @@ rm -rf %{buildroot}/etc/examples %changelog * Thu Mar 23 2017 Ben Cotton - 8.6.1-1 - Update to latest source 8.6.1 +- Remove the deltacloud package (removed upstream) +- Add additional files generated by new upstream release * Thu Mar 09 2017 Ben Cotton - 8.5.2-5 - Add a BuildRequires for boost-python