diff --git a/spack.changes b/spack.changes index be6e81c..499c13a 100644 --- a/spack.changes +++ b/spack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 2 12:41:12 UTC 2022 - Egbert Eich + +- Remove unneeded build dependency. +- Make dependencies of spack and spack-recipes symetrical. + ------------------------------------------------------------------- Thu Feb 10 13:58:04 UTC 2022 - Egbert Eich diff --git a/spack.spec b/spack.spec index 360a7f8..a80fad2 100644 --- a/spack.spec +++ b/spack.spec @@ -30,7 +30,7 @@ ExclusiveArch: do_not_build # These packages are found and can be used by spack, /etc/spack/packages-yaml # needs to be updated when one of these packages is updated or uninstalled. # Distinguish between packages we recommend and packages which -%define spack_trigger_recommended autoconf bash bison bzip2 libzip-devel cmake-full ccache cpio diffutils findutils flex gcc gcc-c++ gcc-fortran git-lfs make m4 ncurses-devel libtool openssl-devel perl-base pkgconf pkg-config python3-base tar info xz xz-devel +%define spack_trigger_recommended autoconf bash bison bzip2 libzip-devel cmake-full ccache cpio diffutils findutils flex gcc gcc-c++ gcc-fortran git-lfs make m4 ncurses-devel libtool openssl-devel perl-base pkgconf pkg-config python3-base tar info xz xz-devel # packages recognized by spack, but not recommended %define spack_trigger_packages ghostscript go fish fzf hugo java-11-openjdk-devel java-14-openjdk-devel java-15-openjdk-devel java-16-openjdk-devel java-1_8_0-openjdk-devel ruby openmpi1-devel openmpi2-devel openmpi3-devel openmpi4-devel openmpi1-gnu-hpc-devel openmpi2-gnu-hpc-devel openmpi3-gnu-hpc-devel openmpi4-gnu-hpc-devel mvapich2-devel mpich-devel gcc7 gcc8 gcc9 gcc10 gcc11 gcc7-c++ gcc8-c++ gcc9-c++ gcc10-c++ gcc11-c++ gcc7-fortran gcc8-fortran gcc9-fortran gcc10-fortran gcc11-fortran # non oss packages @@ -60,7 +60,6 @@ Patch9: Add-support-for-container-building-using-a-SLE-base-container.pa BuildRequires: fdupes BuildRequires: lua-lmod BuildRequires: polkit -BuildRequires: python-base BuildRequires: python3-urllib3 BuildRequires: sudo BuildRequires: sysuser-tools @@ -81,7 +80,6 @@ Requires: sudo Requires: tar Requires: xz Recommends: %spack_trigger_recommended -Recommends: spack-recipes = %version %else BuildRequires: git BuildRequires: makeinfo @@ -115,7 +113,7 @@ This package provides a module file that must be loaded to use spack. %package recipes Summary: Spack built-in package recipes -Requires: %{name} >= %version +Requires: %{name} = %version %description recipes Spack is a configurable Python-based HPC package manager, automating @@ -309,7 +307,7 @@ EOF # compile python files for python3 # %%{buildroot}%%{spack_dir}/spack -%py_compile . +%py3_compile . # make shell scripts executeable find %{buildroot}%{_localstatedir}/lib/spack/ -type f -name \*.sh -exec chmod 755 {} \;