diff --git a/.gitignore b/.gitignore index ba35dee..169179f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,3 @@ _build /htcondor-8.3.1.tar.gz /htcondor-8.3.5.tar.gz /htcondor-8.3.6.tar.gz -/htcondor-8.2.9.tar.gz -/classads-1.0.10.tar.gz diff --git a/condor.spec b/condor.spec index ff511c3..9e78499 100644 --- a/condor.spec +++ b/condor.spec @@ -1,11 +1,8 @@ %global newname htcondor -%global srcver 8_2_9 -%global release 1 +%global srcver 8_3_6 #global commit a1a7df5888506c46cf7ce54ef8171336b7c71e72 #global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global compatver 1.0.10 - %ifarch %{arm} %{ix86} x86_64 %global with_mongodb 1 %endif @@ -21,7 +18,7 @@ ####################### Name: condor -Version: 8.2.9 +Version: 8.3.6 Release: 1%{?dist} #Release: 1.%{shortcommit}%{?dist} Summary: Condor: High Throughput Computing @@ -37,7 +34,6 @@ Source0: https://github.com/htcondor/htcondor/archive/V%{srcver}/%{newnam Source1: %{name}-tmpfiles.conf Source2: %{name}.service Source3: 00personal_condor.config -Source4: http://ftp.cs.wisc.edu/condor/classad/c++/classads-%{compatver}.tar.gz Patch1: condor-gahp.patch # turn off the cmake regex-replace hack that removes "-Werror", as it @@ -248,8 +244,8 @@ resources exposed by the deltacloud API. %package classads Summary: HTCondor's classified advertisement language Group: Development/Libraries -Obsoletes: classads <= 1.0.10-2 -Provides: classads <= 1.0.10-2 +Obsoletes: classads <= 1.0.8 +Obsoletes: classads-static <= 1.0.8 %description classads Classified Advertisements (classads) are the lingua franca of @@ -271,15 +267,13 @@ that evaluates to true in the context of the other ad. Classad matching is used by the HTCondor central manager to determine the compatibility of jobs and workstations where they may be run. - ####################### %package classads-devel Summary: Headers for HTCondor's classified advertisement language Group: Development/System Requires: %name-classads = %version-%release Requires: pcre-devel -Obsoletes: classads-devel <= 1.0.10-2 -Provides: classads-devel = 1.0.10-2 +Obsoletes: classads-devel <= 1.0.8 %description classads-devel Header files for HTCondor's ClassAd Library, a powerful and flexible, @@ -326,17 +320,6 @@ the ClassAd library and HTCondor from python #cluster. This allows the user to run their workflows using Condor tools across #multiple clusters. -# Put compat package first else modified version wins. -%package -n classads-compat -Version: %{compatver} -Summary: HTCondor's classified advertisement language -Group: Development/Libraries - -%description -n classads-compat -Provides runtime classad libraries from version 1.0.10 of -classads. - - %pre getent group %{name} >/dev/null || groupadd -r %{name} getent passwd %{name} >/dev/null || \ @@ -345,8 +328,8 @@ getent passwd %{name} >/dev/null || \ exit 0 %prep -# Extract source 4 also, the compatver classads. -%setup -q -n %{newname}-%{srcver} -a 4 +%setup -q -n %{newname}-%{srcver} +#setup -q -n %{newname}-%{commit} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -358,11 +341,6 @@ cp %{SOURCE2} %{name}.service cp %{SOURCE3} . %build -# Build the compat version. -pushd classads-%{compatver} -%configure --enable-namespace --enable-flexible-member --disable-static -make %{?_smp_mflags} -popd %cmake -DNO_PHONE_HOME:BOOL=TRUE \ -DBUILD_TESTING:BOOL=FALSE \ -DBUILDID:STRING=RH-%{version}-%{release} \ @@ -407,12 +385,6 @@ popd make %install -# Install the compat version. -pushd classads-%{compatver} -make install DESTDIR=%{buildroot} -# And remove eveything except .so files. -find %{buildroot} ! -type d ! -name libclassad_ns.so.1* ! -name libclassad.so.1* -exec rm {} \; -popd # installation happens into a temporary location, this function is # useful in moving files into their final locations function populate { @@ -421,6 +393,7 @@ function populate { mv $_src "%{buildroot}/$_dest" } +rm -rf %{buildroot} make install DESTDIR=%{buildroot} # The install target puts etc/ under usr/, let's fix that. @@ -433,7 +406,7 @@ populate %{_datadir}/condor %{buildroot}/%{_usr}/lib/* # Except for the shared libs populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libclassad.s* populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libcondor_utils*.so -populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/libpyclassad2.6_%{srcver}.so +populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/libpyclassad2.7_%{srcver}.so rm -f %{buildroot}/%{_datadir}/condor/libclassad.a # It is proper to put HTCondor specific libexec binaries under libexec/condor/ @@ -513,6 +486,9 @@ install -m 0644 %{name}-tmpfiles.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{na mkdir -p %{buildroot}%{_localstatedir}/run/ install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/ +mkdir -p %{buildroot}%{_unitdir} +cp %{name}.service %{buildroot}%{_unitdir}/condor.service + #populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad_*.a populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so @@ -605,6 +581,7 @@ echo "*********** Verify NMI status is all GREEN ***********" %dir %_sysconfdir/condor/ %config(noreplace) %_sysconfdir/condor/condor_config %config(noreplace) %_sysconfdir/tmpfiles.d/%{name}.conf +%{_unitdir}/condor.service %dir %_datadir/condor/ %_datadir/condor/CondorJavaInfo.class %_datadir/condor/CondorJavaWrapper.class @@ -634,6 +611,8 @@ echo "*********** Verify NMI status is all GREEN ***********" %_libexecdir/condor/data_plugin %_libexecdir/condor/curl_plugin %_libexecdir/condor/condor_shared_port +%_libexecdir/condor/condor_sinful +%_libexecdir/condor/condor_testingd %_libexecdir/condor/condor_glexec_wrapper %_libexecdir/condor/glexec_starter_setup.sh %_libexecdir/condor/condor_defrag @@ -698,6 +677,8 @@ echo "*********** Verify NMI status is all GREEN ***********" %_mandir/man1/condor_pool_job_report.1.gz %_mandir/man1/condor_sos.1.gz %_mandir/man1/condor_urlfetch.1.gz +%_mandir/man1/condor_job_router_info.1.gz +%_mandir/man1/condor_update_machine_ad.1.gz # bin/condor is a link for checkpoint, reschedule, vacate %_libdir/libcondor_utils*.so %_bindir/condor_submit_dag @@ -743,6 +724,7 @@ echo "*********** Verify NMI status is all GREEN ***********" %_bindir/condor_tail %_bindir/condor_pool_job_report %_bindir/condor_job_router_info +%_bindir/condor_update_machine_ad %_sbindir/condor_advertise %_sbindir/condor_c-gahp %_sbindir/condor_c-gahp_worker_thread @@ -924,13 +906,7 @@ echo "*********** Verify NMI status is all GREEN ***********" ################# %files classads %doc LICENSE-2.0.txt NOTICE.txt -%_libdir/libclassad.so.7* -%_libdir/libclassad.so.8* - -%files -n classads-compat -%doc LICENSE-2.0.txt NOTICE.txt -%_libdir/libclassad.so.1* -%_libdir/libclassad_ns.so.1* +%_libdir/libclassad.so.* ################# %files classads-devel @@ -980,7 +956,7 @@ echo "*********** Verify NMI status is all GREEN ***********" %files python %{python_sitearch}/classad.so %{python_sitearch}/htcondor.so -%{python_sitearch}/libpyclassad2.6_%{srcver}.so +%{python_sitearch}/libpyclassad2.7_%{srcver}.so ################# #%files bosco @@ -1016,12 +992,14 @@ echo "*********** Verify NMI status is all GREEN ***********" ################# ################# %post +%systemd_post %{name}.service /sbin/ldconfig -%post -n classads-compat -/sbin/ldconfig +%preun +%systemd_preun %{name}.service %postun -n condor +%systemd_postun_with_restart %{name}.service /sbin/ldconfig %post classads -p /sbin/ldconfig @@ -1029,10 +1007,6 @@ echo "*********** Verify NMI status is all GREEN ***********" %postun classads -p /sbin/ldconfig %changelog -* Thu Sep 17 2015 Steve Traylen - 8.2.9-1 -- Adapt epel7 8.3.6 for an 8.2.9 (stable) release on el6. -- Add a classads-compat-1.0.10 to satisfy existing runtime. - * Sat Jul 11 2015 František Dvořák - 8.3.6-1 - Disable aviary and deltacloud for EPEL 7 - Patch for PPC64 diff --git a/sources b/sources index dc90333..621010d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -73004c3e8bedb08a4510fc747022ada5 htcondor-8.2.9.tar.gz -fef07b6061ef0b1c8518bad4eed56389 classads-1.0.10.tar.gz +5c1465a4a468aed933ad1dcfa3fa893b htcondor-8.3.6.tar.gz