diff --git a/.gitignore b/.gitignore index faf3c40..f2a3800 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libpsm2-11.2.206.tar.gz +/PSM2_11.2.230.tar.gz diff --git a/libpsm2.spec b/libpsm2.spec index 25a71e8..c23203d 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -52,17 +52,12 @@ # Summary: Intel PSM Libraries Name: libpsm2 -Version: 11.2.206 -Release: 1%{?dist} +Version: 11.2.230 +Release: 1%{?dist}.1 License: BSD or GPLv2 -URL: https://github.com/intel/opa-psm2 +URL: https://github.com/cornelisnetworks/opa-psm2/ -# The tarball can be created by: -# git clone https://github.com/intel/opa-psm2.git -# cd opa-psm2 -# git checkout c3a7d9468d5623c0164b783346bada8664a9a2c9 -# make dist -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/cornelisnetworks/opa-psm2/archive/refs/tags/PSM2_%{version}.tar.gz # The OPA product is supported on x86_64 only: ExclusiveArch: x86_64 @@ -70,6 +65,7 @@ BuildRequires: libuuid-devel BuildRequires: numactl-devel BuildRequires: systemd BuildRequires: gcc +BuildRequires: make Obsoletes: hfi1-psm < 1.0.0 %package devel @@ -100,18 +96,23 @@ Development files for the Intel PSM library Support for MPIs linked with PSM versions < 2 %prep -%setup -q -n %{name}-%{version} +%setup -q -n opa-psm2-PSM2_%{version} %build %{set_build_flags} -make %{?_smp_mflags} +%{make_build} %install +%if 0%{?fedora} +export DISTRO=fedora +%endif +%if 0%{?rhel} +export DISTRO=rhel +%endif %make_install rm -f %{buildroot}%{_libdir}/*.a -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING @@ -141,6 +142,14 @@ rm -f %{buildroot}%{_libdir}/*.a %endif %changelog +* Wed Feb 08 2023 Michal Schmidt - 11.2.230-1.1 +- Disable the gating test that does not work without hfi1 hardware. +- Resolves: rhbz#2110923 + +* Fri Feb 03 2023 Michal Schmidt - 11.2.230-1 +- Rebase to upstream release 11.2.230 +- Resolves: rhbz#2110923 + * Tue Dec 07 2021 Honggang Li - 11.2.206-1 - Rebase to latest upstream release 11.2.206 - Resolves: bz1989162 diff --git a/sources b/sources index c7381ad..5c55190 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpsm2-11.2.206.tar.gz) = 48c67c7366f56bafd6bdea0b592e511a3a0557846c5278ee76de162c8c2b30be63f41e5608b3e009ba8202186d8a8b69e949c98d6d478f47be379262b8d28edf +SHA512 (PSM2_11.2.230.tar.gz) = cf17c83de38e25ddc7c116a1dd03fbe96c374403df789f19f4f03b65d73ddb1f15bb508dd2e3e2c4078b0fce1b1a13adfa532f975201c71cb0fd47ea53d790af