From b8e6410623a5374bee4c5b680ec71817e654c1242392b47abeb4cfe89823a975 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 10 Jan 2022 21:49:26 +0000 Subject: [PATCH] Accepting request 945312 from home:mslacken:sp - updated to spack 0.17.1 with following chnages: * Allow locks to work under high contention (#27846) * Improve errors messages from clingo (#27707 #27970) * Respect package permissions for sbang (#25764) * Fix --enable-locks behavior (#24675) * Fix log-format reporter ignoring install errors (#25961) * Fix overloaded argparse keys (#27379) * Allow style commands to run with targets other than "develop" (#27472) * Log lock messages to debug level, instead of verbose level (#27408) * Handle invalid unicode while logging (#21447) * spack audit: fix API calls to variants (#27713) * Provide meaningful message for empty environment installs (#28031) * Added opensuse leap containers to spack containerize (#27837) * Revert "patches: make re-applied patches idempotent" (#27625) * MANPATH can use system defaults (#21682) * Add "setdefault" subcommand to `spack module tcl` (#14686) * Regenerate views when specs already installed (#28113) - removed leap-container.patch as incoperated upstream OBS-URL: https://build.opensuse.org/request/show/945312 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=41 --- leap-container.patch | 63 -------------------------------------------- spack-0.17.0.tar.gz | 3 --- spack-0.17.1.tar.gz | 3 +++ spack.changes | 22 ++++++++++++++++ spack.spec | 5 ++-- 5 files changed, 27 insertions(+), 69 deletions(-) delete mode 100644 leap-container.patch delete mode 100644 spack-0.17.0.tar.gz create mode 100644 spack-0.17.1.tar.gz diff --git a/leap-container.patch b/leap-container.patch deleted file mode 100644 index 7bf77af..0000000 --- a/leap-container.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst -index 3d32de0841..57a9cad189 100644 ---- a/lib/spack/docs/containers.rst -+++ b/lib/spack/docs/containers.rst -@@ -129,6 +129,9 @@ are currently supported are summarized in the table below: - * - CentOS 7 - - ``centos:7`` - - ``spack/centos7`` -+ * - openSUSE Leap -+ - ``opensuse/leap`` -+ - ``spack/leap15`` - - All the images are tagged with the corresponding release of Spack: - -diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json -index ee4e5a2caa..8e42329725 100644 ---- a/lib/spack/spack/container/images.json -+++ b/lib/spack/spack/container/images.json -@@ -28,6 +28,19 @@ - "develop": "latest" - } - }, -+ "leap:15": { -+ "bootstrap": { -+ "template": "container/leap15.dockerfile" -+ }, -+ "os_package_manager": "zypper", -+ "build": "spack/leap15", -+ "build_tags": { -+ "develop": "latest" -+ }, -+ "final": { -+ "image": "opensuse/leap:latest" -+ } -+ }, - "nvidia/cuda:11.2.1": { - "bootstrap": { - "template": "container/cuda_11_2_1.dockerfile", -@@ -85,6 +98,11 @@ - "update": "yum update -y && amazon-linux-extras install epel -y", - "install": "yum install -y", - "clean": "rm -rf /var/cache/yum && yum clean all" -+ }, -+ "zypper": { -+ "update": "zypper update -y", -+ "install": "zypper install -y", -+ "clean": "rm -rf /var/cache/zypp && zypper clean -a" - } - } - } -diff --git a/share/spack/docker/leap-15.dockerfile b/share/spack/docker/leap-15.dockerfile -index 65375c359b..eeaf90f524 100644 ---- a/share/spack/docker/leap-15.dockerfile -+++ b/share/spack/docker/leap-15.dockerfile -@@ -2,7 +2,7 @@ FROM opensuse/leap:15.3 - MAINTAINER Christian Goll - - ENV DOCKERFILE_BASE=opensuse \ -- DOCKERFILE_DISTRO=opensuse_leap \ -+ DOCKERFILE_DISTRO=leap \ - DOCKERFILE_DISTRO_VERSION=15.3 \ - SPACK_ROOT=/opt/spack \ - DEBIAN_FRONTEND=noninteractive \ diff --git a/spack-0.17.0.tar.gz b/spack-0.17.0.tar.gz deleted file mode 100644 index 2c55918..0000000 --- a/spack-0.17.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93df99256a892ceefb153d48e2080c01d18e58e27773da2c2a469063d67cb582 -size 6747773 diff --git a/spack-0.17.1.tar.gz b/spack-0.17.1.tar.gz new file mode 100644 index 0000000..88ba615 --- /dev/null +++ b/spack-0.17.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96850f750c5a17675275aa059eabc2ae09b7a8c7b59c5762d571925b6897acfb +size 6749505 diff --git a/spack.changes b/spack.changes index 2466f03..6a60749 100644 --- a/spack.changes +++ b/spack.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Jan 10 12:45:19 UTC 2022 - Christian Goll + +- updated to spack 0.17.1 with following chnages: + * Allow locks to work under high contention (#27846) + * Improve errors messages from clingo (#27707 #27970) + * Respect package permissions for sbang (#25764) + * Fix --enable-locks behavior (#24675) + * Fix log-format reporter ignoring install errors (#25961) + * Fix overloaded argparse keys (#27379) + * Allow style commands to run with targets other than "develop" (#27472) + * Log lock messages to debug level, instead of verbose level (#27408) + * Handle invalid unicode while logging (#21447) + * spack audit: fix API calls to variants (#27713) + * Provide meaningful message for empty environment installs (#28031) + * Added opensuse leap containers to spack containerize (#27837) + * Revert "patches: make re-applied patches idempotent" (#27625) + * MANPATH can use system defaults (#21682) + * Add "setdefault" subcommand to `spack module tcl` (#14686) + * Regenerate views when specs already installed (#28113) +- removed leap-container.patch as incoperated upstream + ------------------------------------------------------------------- Tue Dec 14 11:13:37 UTC 2021 - Christian Goll diff --git a/spack.spec b/spack.spec index 52752d4..cf629dd 100644 --- a/spack.spec +++ b/spack.spec @@ -1,7 +1,7 @@ # # spec file for package spack # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,7 @@ ExclusiveArch: do_not_build # non oss packages %define spack_trigger_external cuda-nvcc Name: spack -Version: 0.17.0 +Version: 0.17.1 Release: 0 Summary: Package manager for HPC systems License: Apache-2.0 AND MIT AND Python-2.0 AND BSD-3-Clause @@ -55,7 +55,6 @@ Patch5: Make-spack-paths-compliant-to-distro-installation.patch Patch6: Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch Patch7: Fix-Spinx-configuration-to-avoid-throwing-errors.patch Patch8: Set-modules-default-to-lmod.patch -Patch9: leap-container.patch %if %{without doc} BuildRequires: fdupes BuildRequires: lua-lmod