Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spack for openSUSE:Factory checked in at 2021-02-07 15:20:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spack (Old) and /work/SRC/openSUSE:Factory/.spack.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spack" Sun Feb 7 15:20:42 2021 rev:2 rq:869552 version:0.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/spack/spack.changes 2020-12-29 15:48:41.044378413 +0100 +++ /work/SRC/openSUSE:Factory/.spack.new.28504/spack.changes 2021-02-07 15:23:38.162172929 +0100 @@ -1,0 +2,9 @@ +Thu Feb 4 06:54:13 UTC 2021 - Egbert Eich <[email protected]> + +- Add + * Fix-documentation-so-that-parser-doesn-t-stumble.patch: + * Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch + Fix documentation building. +- Fix texinfo file installation. + +------------------------------------------------------------------- New: ---- Fix-documentation-so-that-parser-doesn-t-stumble.patch Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spack.spec ++++++ --- /var/tmp/diff_new_pack.7ltKNY/_old 2021-02-07 15:23:38.866173733 +0100 +++ /var/tmp/diff_new_pack.7ltKNY/_new 2021-02-07 15:23:38.870173738 +0100 @@ -1,7 +1,7 @@ # # spec file for package spack # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{?nil} %if "%{flavor}" == "doc" %bcond_without doc @@ -48,33 +49,35 @@ Patch2: Adapt-shell-scripts-that-set-up-the-environment-for-different-shells.patch Patch3: added-dockerfile-for-opensuse-leap-15.patch Patch4: added-target-and-os-calls-to-output-of-spack-spec-co.patch +Patch5: Fix-documentation-so-that-parser-doesn-t-stumble.patch +Patch6: Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch # upstream patch removes also problemtatic binaries #Patch4: spack-test-15702.patch %if %{without doc} -BuildRequires: polkit BuildRequires: fdupes +BuildRequires: lua-lmod +BuildRequires: polkit BuildRequires: python-base BuildRequires: python3-urllib3 -BuildRequires: lua-lmod Requires: %{name}-recipes = %{version} +Requires: bzip2 Requires: curl -Requires: lua-lmod -Requires: polkit Requires: gcc-fortran Requires: gpg2 -Requires: xz -Requires: bzip2 +Requires: lua-lmod +Requires: polkit Requires: spack-recipes +Requires: xz Recommends: spack-recipes = %version Recommends: %spack_trigger_recommended %else -BuildRequires: patterns-base-basesystem -BuildRequires: spack -BuildRequires: makeinfo -BuildRequires: distribution-release BuildRequires: %{python_module Sphinx >= 1.8} BuildRequires: %{python_module sphinxcontrib-programoutput} +BuildRequires: distribution-release BuildRequires: git +BuildRequires: makeinfo +BuildRequires: patterns-base-basesystem +BuildRequires: spack # html BuildRequires: graphviz # info @@ -88,7 +91,6 @@ %define __python3 python3 %endif - %description Spack is a configurable Python-based HPC package manager, automating the installation and fine-tuning of simulations and libraries. @@ -252,7 +254,6 @@ binary_index_root: ~/.spack/indices EOF - # compile python files for python3 # %%{buildroot}%%{spack_dir}/spack %py_compile . @@ -355,13 +356,13 @@ mkdir -p %{buildroot}%{_mandir}/man1 cd lib/spack/docs/_build cp man/spack.1.gz %{buildroot}%{_mandir}/man1/ -cp -r texinfo/Spack.info.gz texinfo/Spack-figures %{buildroot}%{_infodir} +cp -r texinfo/Spack.info.gz %{buildroot}%{_infodir} +[ -d texinfo/Spack-figures ] && cp -r texinfo/Spack-figures %{buildroot}%{_infodir} %endif %pre getent group %spack_group >/dev/null || groupadd -r %spack_group - %post # Replace /etc/spack/compilers.yaml export GCC_VERSION=`gcc -dumpversion` @@ -387,12 +388,12 @@ %triggerin -- %{?spack_trigger_recommended} %{?spack_trigger_packages} %{?spack_trigger_external} test -e %{_sysconfdir}/spack/no_rpm_trigger || spack external find --scope system test -e %{_sysconfdir}/spack/no_rpm_trigger || echo "Create %{_sysconfdir}/spack/no_rpm_trigger to stop spack to search for new packages after a rpm install" + %triggerpostun -- %{?spack_trigger_recommended} %{?spack_trigger_packages} %{?spack_trigger_external} test -e %{_sysconfdir}/spack/no_rpm_trigger || rm /etc/spack/packages.yaml test -e %{_sysconfdir}/spack/no_rpm_trigger || spack external find --scope system test -e %{_sysconfdir}/spack/no_rpm_trigger || echo "Create %{_sysconfdir}/spack/no_rpm_trigger to stop spack to search for new packages after a rpm install" - %if %{without doc} %files %license COPYRIGHT LICENSE-APACHE LICENSE-MIT @@ -424,6 +425,13 @@ %{_localstatedir}/lib/spack/repos %else + +%post info +%install_info --info-dir=%{_infodir} --info-file="%{_infodir}/Spack.info.gz" + +%preun info +%install_info_delete --info-dir=%{_infodir} --info-file="%{_infodir}/Spack.info.gz" + %files man %{_mandir}/man1/* ++++++ Fix-documentation-so-that-parser-doesn-t-stumble.patch ++++++ From: Egbert Eich <[email protected]> Date: Thu Feb 4 07:51:10 2021 +0100 Subject: Fix documentation so that parser doesn't stumble Patch-mainline: Not yet Git-commit: 7e787fef5e2c87c53166ee71670f1787300cced3 References: Add argument to code-block:: Signed-off-by: Egbert Eich <[email protected]> --- lib/spack/docs/build_systems/autotoolspackage.rst | 2 +- lib/spack/docs/build_systems/pythonpackage.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/spack/docs/build_systems/autotoolspackage.rst b/lib/spack/docs/build_systems/autotoolspackage.rst index a4c15e5..21913a6 100644 --- a/lib/spack/docs/build_systems/autotoolspackage.rst +++ b/lib/spack/docs/build_systems/autotoolspackage.rst @@ -348,7 +348,7 @@ Defining ``with_or_without_verbs`` overrides the behavior of a ``--with-openib`` for older versions of the package and specifying an alternative dependency name: -.. code-block:: +.. code-block:: console --with-openib=</path/to/rdma-core> diff --git a/lib/spack/docs/build_systems/pythonpackage.rst b/lib/spack/docs/build_systems/pythonpackage.rst index c2da028..695b446 100644 --- a/lib/spack/docs/build_systems/pythonpackage.rst +++ b/lib/spack/docs/build_systems/pythonpackage.rst @@ -90,7 +90,7 @@ Instead of using the ``PythonPackage`` base class, you should extend the ``Package`` base class and implement the following custom installation procedure: -.. code-block:: +.. code-block:: python def install(self, spec, prefix): pip = which('pip') ++++++ Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch ++++++ From: Egbert Eich <[email protected]> Date: Thu Feb 4 09:17:55 2021 +0100 Subject: Fix error during documentation build due to recursive module inclusion Patch-mainline: Not yet Git-commit: 7102b892cfc6e0697b658f35b7774a03bd1c42e9 References: Signed-off-by: Egbert Eich <[email protected]> --- lib/spack/spack/user_environment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/user_environment.py b/lib/spack/spack/user_environment.py index f08f21e..0da6c43 100644 --- a/lib/spack/spack/user_environment.py +++ b/lib/spack/spack/user_environment.py @@ -8,7 +8,7 @@ import spack.config import spack.util.prefix as prefix import spack.util.environment as environment -import spack.build_environment as build_env +import spack.build_environment #: Environment variable name Spack uses to track individually loaded packages spack_loaded_hashes_var = 'SPACK_LOADED_HASHES' @@ -85,13 +85,13 @@ def environment_modifications_for_spec(spec, view=None): # Let the extendee/dependency modify their extensions/dependents # before asking for package-specific modifications env.extend( - build_env.modifications_from_dependencies( + build_environment.modifications_from_dependencies( spec, context='run' ) ) # Package specific modifications - build_env.set_module_variables_for_package(spec.package) + build_environment.set_module_variables_for_package(spec.package) spec.package.setup_run_environment(env) return env
