Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package slurm for openSUSE:Factory checked in at 2021-09-08 21:36:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slurm (Old) and /work/SRC/openSUSE:Factory/.slurm.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slurm" Wed Sep 8 21:36:49 2021 rev:63 rq:917457 version:21.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/slurm/slurm.changes 2021-09-07 21:21:59.581344417 +0200 +++ /work/SRC/openSUSE:Factory/.slurm.new.1899/slurm.changes 2021-09-08 21:37:12.529930071 +0200 @@ -1,0 +2,8 @@ +Mon Sep 6 15:34:06 UTC 2021 - Egbert Eich <[email protected]> + +- Fix-statement-condition-in-netloc-autoconf-macro.patch: + Fix netloc check, reestablish netloc disable code. +- Make configure arg '--with-pmix' conditional. +- Move openapi plugins to package slurm-restd. + +------------------------------------------------------------------- New: ---- Fix-statement-condition-in-netloc-autoconf-macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slurm.spec ++++++ --- /var/tmp/diff_new_pack.klb2CV/_old 2021-09-08 21:37:13.049930680 +0200 +++ /var/tmp/diff_new_pack.klb2CV/_new 2021-09-08 21:37:13.053930685 +0200 @@ -1,5 +1,5 @@ # -# spec file +# spec file for package slurm # # Copyright (c) 2021 SUSE LLC # @@ -87,6 +87,10 @@ %define build_slurmrestd 1 %endif +%if 0 +%define have_netloc 1 +%endif + %if 0%{?is_opensuse} && 0%{!?sle_version:1} %define is_factory 1 %endif @@ -131,6 +135,7 @@ Patch1: slurm-2.4.4-init.patch Patch2: pam_slurm-Initialize-arrays-and-pass-sizes.patch Patch3: load-pmix-major-version.patch +Patch100: Fix-statement-condition-in-netloc-autoconf-macro.patch %{?upgrade:Provides: %{pname} = %{version}} %{?upgrade:Conflicts: %{pname}} @@ -542,6 +547,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch100 -p1 %if 0%{?python_ver} < 3 # Workaround for wrongly flagged python3 to keep SLE-11-SP4 building mkdir -p mybin; ln -s /usr/bin/python2 mybin/python3 @@ -556,11 +562,12 @@ --without-rpath \ --without-datawarp \ --with-shared-libslurm \ - --with-pmix=/usr/ \ + %{?with_pmix:--with-pmix=/usr/} \ %if 0%{?build_slurmrestd} --enable-slurmrestd \ %endif --with-yaml \ +%{!?have_netloc:--without-netloc} \ --sysconfdir=%{_sysconfdir}/%{pname} \ %{!?have_hdf5:--without-hdf5} \ %{!?have_lz4:--without-lz4} \ @@ -727,6 +734,7 @@ # Temporary - remove when build is fixed upstream. %if !0%{?build_slurmrestd} rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.* +rm -f %{buildroot}/%{_libdir}/slurm/openapi_* %endif %check @@ -924,6 +932,7 @@ %{_bindir}/sshare %{_bindir}/sstat %{_bindir}/strigger +%{?have_netloc:%{_bindir}/netloc_to_topology} %{_sbindir}/slurmctld %{_sbindir}/slurmsmwd %dir %{_libdir}/slurm/src @@ -1102,8 +1111,6 @@ %{_libdir}/slurm/mpi_pmix_v3.so %endif %{_libdir}/slurm/node_features_helpers.so -%{_libdir}/slurm/openapi_dbv0_0_37.so -%{_libdir}/slurm/openapi_v0_0_37.so %{_libdir}/slurm/power_none.so %{_libdir}/slurm/preempt_none.so %{_libdir}/slurm/preempt_partition_prio.so @@ -1182,6 +1189,8 @@ %{?comp_at} %{_sbindir}/slurmrestd %{_mandir}/man8/slurmrestd.* +%{_libdir}/slurm/openapi_dbv0_0_37.so +%{_libdir}/slurm/openapi_v0_0_37.so %{_libdir}/slurm/openapi_dbv0_0_36.so %{_libdir}/slurm/openapi_v0_0_35.so %{_libdir}/slurm/openapi_v0_0_36.so ++++++ Fix-statement-condition-in-netloc-autoconf-macro.patch ++++++ >From 1f8be9ffb586b8bc3e5c7bf45cef16db5bf9b479 Mon Sep 17 00:00:00 2001 From: Tim McMullan <[email protected]> Date: Thu, 26 Aug 2021 16:58:37 -0600 Subject: [PATCH] Fix statement condition in netloc autoconf macro. Includes output of running 'autoreconf -i'. Continuation of d7c089ec63. Bug 12370 --- NEWS | 1 + auxdir/x_ac_netloc.m4 | 2 +- configure | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) --- a/auxdir/x_ac_netloc.m4 +++ b/auxdir/x_ac_netloc.m4 @@ -21,7 +21,7 @@ AC_DEFUN([X_AC_NETLOC], [AS_IF([test "x$with_netloc" != xno && test "x$with_netloc" != xyes], [_x_ac_netloc_dirs="$with_netloc"])]) - if [test "$with_netloc" = xno]; then + if [test "x$with_netloc" = xno]; then AC_MSG_WARN([support for netloc disabled]) else AC_CACHE_CHECK( diff --git a/configure b/configure index 3dbe39b9b8..d563cfcd56 100755 --- a/configure +++ b/configure @@ -24168,7 +24168,7 @@ fi fi - if test "$with_netloc" = xno; then + if test "x$with_netloc" = xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: support for netloc disabled" >&5 $as_echo "$as_me: WARNING: support for netloc disabled" >&2;} else -- 2.26.2
