From 5c57adce9d8f7eaf1bb9deb952bdffae78b89753 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2020 06:10:14 +0000
Subject: import libpsm2-11.2.185-1.el8


---

diff --git a/.gitignore b/.gitignore
index 010788c..7072623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libpsm2-11.2.91_1.tar.gz
+SOURCES/libpsm2-11.2.185.tar.gz
diff --git a/.libpsm2.metadata b/.libpsm2.metadata
index 5dd87e5..549ff91 100644
--- a/.libpsm2.metadata
+++ b/.libpsm2.metadata
@@ -1 +1 @@
-e630e42f9ea3862931f2b148e4176fc9ce032900 SOURCES/libpsm2-11.2.91_1.tar.gz
+725613650b5647ceb7bc5e47a9b9d296bea5d3be SOURCES/libpsm2-11.2.185.tar.gz
diff --git a/SOURCES/0001-temporally-replace-g3-with-default-g.patch b/SOURCES/0001-temporally-replace-g3-with-default-g.patch
deleted file mode 100644
index 07da971..0000000
--- a/SOURCES/0001-temporally-replace-g3-with-default-g.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 22dcbe8897b4f3a4e42a606c26dd69f0239ae424 Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Tue, 29 Oct 2019 16:16:22 +0800
-Subject: [PATCH] temporally replace '-g3' with default '-g'
-
-rpm debugedit might corrupt the debug file strings when source files
-have been build with gcc -g3 which generates a .debug_macro section
-which shares strings with the .debuginfo section.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1630926
-
-When bz1630926 got fixed, we no longer need this workaround.
-
-Signed-off-by: Honggang Li <honli@redhat.com>
----
- buildflags.mak        | 6 +++---
- compat/buildflags.mak | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/buildflags.mak b/buildflags.mak
-index 10ec288..4c597e1 100644
---- a/buildflags.mak
-+++ b/buildflags.mak
-@@ -163,9 +163,9 @@ ifneq (,${HFI_BRAKE_DEBUG})
-   BASECFLAGS += -DHFI_BRAKE_DEBUG
- endif
- ifneq (,${PSM_DEBUG})
--  BASECFLAGS += -O -g3 -DPSM_DEBUG -D_HFI_DEBUGGING -funit-at-a-time -Wp,-D_FORTIFY_SOURCE=2
-+  BASECFLAGS += -O -g -DPSM_DEBUG -D_HFI_DEBUGGING -funit-at-a-time -Wp,-D_FORTIFY_SOURCE=2
- else
--  BASECFLAGS += -O3 -g3
-+  BASECFLAGS += -O3 -g
- endif
- ifneq (,${PSM_COVERAGE}) # This check must come after PSM_DEBUG to override optimization setting
-   BASECFLAGS += -O -fprofile-arcs -ftest-coverage
-@@ -196,7 +196,7 @@ endif
- 
- BASECFLAGS += -fpic -fPIC -D_GNU_SOURCE
- 
--ASFLAGS += -g3 -fpic
-+ASFLAGS += -g -fpic
- 
- BASECFLAGS += ${OPA_CFLAGS}
- 
-diff --git a/compat/buildflags.mak b/compat/buildflags.mak
-index b448e4e..ab501d5 100644
---- a/compat/buildflags.mak
-+++ b/compat/buildflags.mak
-@@ -84,10 +84,10 @@ BASECFLAGS +=-Wall $(WERROR)
- 
- BASECFLAGS += -fpic -fPIC
- 
--ASFLAGS += -g3 -fpic
-+ASFLAGS += -g -fpic
- 
- ifeq (${CCARCH},icc)
--    BASECFLAGS += -O3 -g3
-+    BASECFLAGS += -O3 -g
-     LDFLAGS += -static-intel
- else
- 	ifeq (${CCARCH},gcc)
--- 
-2.21.0
-
diff --git a/SPECS/libpsm2.spec b/SPECS/libpsm2.spec
index 3c73f4f..1e8308c 100644
--- a/SPECS/libpsm2.spec
+++ b/SPECS/libpsm2.spec
@@ -52,7 +52,7 @@
 #
 Summary: Intel PSM Libraries
 Name: libpsm2
-Version: 11.2.91
+Version: 11.2.185
 Release: 1%{?dist}
 License: BSD or GPLv2
 URL: https://github.com/intel/opa-psm2
@@ -60,12 +60,11 @@ URL: https://github.com/intel/opa-psm2
 # The tarball can be created by:
 # git clone https://github.com/intel/opa-psm2.git
 # cd opa-psm2
-# git checkout 853ab1113c4eabf7218dfab673e433588fe7a8c4
+# git checkout 7a33bedc4bb3dff4e57c00293a2d70890db4d983
 # make dist
-Source0: %{name}-%{version}_1.tar.gz
-Patch1:  0001-temporally-replace-g3-with-default-g.patch
+Source0: %{name}-%{version}.tar.gz
 
-# The OPA product is supported on x86 64 only:
+# The OPA product is supported on x86_64 only:
 ExclusiveArch: x86_64
 BuildRequires: libuuid-devel
 BuildRequires: numactl-devel
@@ -101,8 +100,7 @@ Development files for the Intel PSM library
 Support for MPIs linked with PSM versions < 2
 
 %prep
-%setup -q -n %{name}-%{version}_1
-%patch1 -p1
+%setup -q -n %{name}-%{version}
 
 %build
 %{set_build_flags}
@@ -117,7 +115,7 @@ rm -f %{buildroot}%{_libdir}/*.a
 
 %files
 %license COPYING
-%{_libdir}/libpsm2.so.2.1
+%{_libdir}/libpsm2.so.2.*
 %{_libdir}/libpsm2.so.2
 %if 0%{?rhel} >= 8
 %{_udevrulesdir}/40-psm.rules
@@ -143,6 +141,10 @@ rm -f %{buildroot}%{_libdir}/*.a
 %endif
 
 %changelog
+* Wed Oct 28 2020 Honggang Li <honli@redhat.com> - 11.2.185-1
+- Rebase to latest upstream release 11.2.185
+- Resolves: bz1821736
+
 * Thu Apr 09 2020 Honggang Li <honli@redhat.com> - 11.2.91-1
 - Rebase to latest upstream release 11.2.91
 - Resolves: bz1739284