diff --git a/libpsm2.spec b/libpsm2.spec index 97e4e8a..b045428 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -53,7 +53,7 @@ Summary: Intel PSM Libraries Name: libpsm2 Version: 11.2.86 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD or GPLv2 URL: https://github.com/01org/opa-psm2/ @@ -64,6 +64,7 @@ URL: https://github.com/01org/opa-psm2/ # make dist Source0: %{name}-%{version}.tar.gz Patch0: 0001-Fix-multiple-definition-issues.patch +Patch1: makefile-distro-from-environment.patch # The OPA product is supported on x86 64 only: ExclusiveArch: x86_64 @@ -103,12 +104,19 @@ Support for MPIs linked with PSM versions < 2 %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{set_build_flags} %{make_build} %install +%if 0%{?fedora} +export DISTRO=fedora +%endif +%if 0%{?rhel} +export DISTRO=rhel +%endif %make_install rm -f %{buildroot}%{_libdir}/*.a @@ -142,6 +150,9 @@ rm -f %{buildroot}%{_libdir}/*.a %endif %changelog +* Mon Jul 13 2020 Merlin Mathesius - 11.2.86-5 +- Minor updates to enable building for ELN + * Mon Feb 10 2020 Honggang Li - 11.2.86-4 - Fix FTBFS in Fedora rawhide/f32 - Resolves: bz1799597 diff --git a/makefile-distro-from-environment.patch b/makefile-distro-from-environment.patch new file mode 100644 index 0000000..2ce7330 --- /dev/null +++ b/makefile-distro-from-environment.patch @@ -0,0 +1,13 @@ +diff -ru ../libpsm2-11.2.86.orig/Makefile ./Makefile +--- ../libpsm2-11.2.86.orig/Makefile 2019-10-03 21:00:29.000000000 -0500 ++++ ./Makefile 2020-07-13 13:55:53.994452919 -0500 +@@ -164,7 +164,8 @@ + # The DISTRO variable is used subsequently for variable + # behaviors of the 3 distros. + +-DISTRO := $(shell . /etc/os-release; echo $$ID) ++# Use DISTRO from the environment ++# DISTRO := $(shell . /etc/os-release; echo $$ID) + + # By default the following two variables have the following values: + LIBPSM2_COMPAT_CONF_DIR := /etc