Hello community, here is the log from the commit of package imb for openSUSE:Factory checked in at 2019-02-15 10:02:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imb (Old) and /work/SRC/openSUSE:Factory/.imb.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imb" Fri Feb 15 10:02:01 2019 rev:2 rq:674856 version:2019.1 Changes: -------- --- /work/SRC/openSUSE:Factory/imb/imb.changes 2019-01-21 10:51:19.471948617 +0100 +++ /work/SRC/openSUSE:Factory/.imb.new.28833/imb.changes 2019-02-15 10:02:03.923632257 +0100 @@ -1,0 +2,12 @@ +Mon Feb 11 22:33:01 UTC 2019 - Egbert Eich <[email protected]> + +- Properly create and tear down default version links when the + HPC master packages are installed/uninstalled. +- Cosmetic changes to module file. + +------------------------------------------------------------------- +Fri Jan 25 13:39:30 UTC 2019 - [email protected] + +- Disable openmpi1builds for SLE as well. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imb.spec ++++++ --- /var/tmp/diff_new_pack.obbj3g/_old 2019-02-15 10:02:04.547632056 +0100 +++ /var/tmp/diff_new_pack.obbj3g/_new 2019-02-15 10:02:04.551632055 +0100 @@ -1,7 +1,7 @@ # # spec file for package imb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +12,11 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%global flavor @BUILD_FLAVOR@ +%global flavor @BUILD_FLAVOR@%{nil} # Base package name %define pname imb @@ -25,8 +25,12 @@ %define _ver 2019_1 %if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI1 +%undefine DisOMPI2 %undefine DisOMPI3 %else +%define DisOMPI1 ExclusiveArch: do_not_build +%undefine DisOMPI2 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -63,6 +67,7 @@ %global mpi_flavor openmpi %define mpi_vers 1 %define buildtarget "IMB-MPI1 IMB-EXT" +%{?DisOMPI1} %endif %if "%{flavor}" == "openmpi2" @@ -71,6 +76,7 @@ %global mpi_flavor openmpi %define mpi_vers 2 %define buildtarget "IMB-MPI1 IMB-EXT" +%{?DisOMPI2} %endif %if "%{flavor}" == "openmpi3" @@ -99,16 +105,7 @@ %global mpi_flavor openmpi %define mpi_vers 1 %define buildtarget "IMB-MPI1 IMB-EXT" -%endif - -%if "%{flavor}" == "gnu-openmpi-hpc" -%{bcond_without hpc} -%define compiler_family gnu -%undefine c_f_ver -# macro mpi is used by macros for master package -%global mpi_flavor openmpi -%define mpi_vers 1 -%define buildtarget "IMB-MPI1 IMB-EXT" +%{?DisOMPI1} %endif %if "%{flavor}" == "gnu-openmpi2-hpc" @@ -119,6 +116,7 @@ %global mpi_flavor openmpi %define mpi_vers 2 %define buildtarget "IMB-MPI1 IMB-EXT" +%{?DisOMPI2} %endif %if "%{flavor}" == "gnu-openmpi3-hpc" @@ -165,12 +163,11 @@ measurements for point-to-point and global communication operations for a range of message sizes. -%{?with_hpc:%{hpc_master_package}} +%{?with_hpc:%{hpc_master_package -L}} %prep %setup -n mpi-benchmarks-%{version} - %build %if %{without hpc} @@ -202,14 +199,14 @@ proc ModulesHelp { } { puts stderr " " -puts stderr "This module loads the %{pname} library built with the %{compiler_family} toolchain." +puts stderr "This module loads the %{pname} library built with the %{compiler_family} toolchain and %{mpi_flavor}%{?mpi_vers}." puts stderr "\nVersion %{version}\n" } -module-whatis "Name: %{pname} built with %{compiler_family} toolchain" +module-whatis "Name: %{pname} built with %{compiler_family} toolchain and %{mpi_flavor}%{?mpi_vers}" module-whatis "Version: %{version}" module-whatis "Category: %category" -module-whatis "Description: %{summary:0}" +module-whatis "Description: %{SUMMARY}" module-whatis "URL: %{url}" set version %{version} @@ -221,6 +218,9 @@ EOF %endif +%postun +%{?with_hpc:%hpc_module_delete_if_default} + %files %doc ReadMe_IMB.txt %license license/license.txt license/use-of-trademark-license.txt
