From c43811b9ba69b36c1dd9160c9e2fb65ce0757bf8 Mon Sep 17 00:00:00 2001
From: Adub17030MS <110563293+Adub17030MS@users.noreply.github.com>
Date: Wed, 14 Feb 2024 12:49:45 -0800
Subject: [PATCH] libpsm2 upgrade to v12.0 (#7896)

---
 SPECS/libpsm2/libpsm2.signatures.json |  2 +-
 SPECS/libpsm2/libpsm2.spec            | 14 ++++++++++----
 cgmanifest.json                       |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/SPECS/libpsm2/libpsm2.signatures.json b/SPECS/libpsm2/libpsm2.signatures.json
index 6dd058202e..05267ac169 100644
--- a/SPECS/libpsm2/libpsm2.signatures.json
+++ b/SPECS/libpsm2/libpsm2.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "opa-psm2-PSM2_11.2.206.tar.gz": "08aa41f41bdb485ee037d3f7e32dd45e79858ce38e744d33b9db2af60e3c627a"
+  "opa-psm2-psm-v12.0.tar.gz": "799af0b2bb4bff6060c732246baf9dad716fdf49bce7907cda9bbc522fac5e76"
  }
 }
diff --git a/SPECS/libpsm2/libpsm2.spec b/SPECS/libpsm2/libpsm2.spec
index aa806ff8f6..fdcd8f5294 100644
--- a/SPECS/libpsm2/libpsm2.spec
+++ b/SPECS/libpsm2/libpsm2.spec
@@ -52,18 +52,20 @@
 #
 Summary:        Intel PSM Libraries
 Name:           libpsm2
-Version:        11.2.206
-Release:        3%{?dist}
+Version:        12.0
+Release:        1%{?dist}
 License:        BSD-3-Clause OR GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://github.com/cornelisnetworks/opa-psm2/
-Source0:        https://github.com/cornelisnetworks/opa-psm2/archive/refs/tags/PSM2_11.2.206.tar.gz#/opa-psm2-PSM2_%{version}.tar.gz
+Source0:        https://github.com/cornelisnetworks/opa-psm2/archive/refs/tags/psm-v%{version}.tar.gz#/opa-psm2-psm-v%{version}.tar.gz
 BuildRequires:  gcc
 BuildRequires:  libuuid-devel
 BuildRequires:  make
 BuildRequires:  numactl-devel
+BuildRequires:  perl
 BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
 Obsoletes:      hfi1-psm < 1.0.0
 # The OPA product is supported on x86_64 only:
 ExclusiveArch:  x86_64
@@ -95,7 +97,7 @@ Development files for the Intel PSM library
 Support for MPIs linked with PSM versions < 2
 
 %prep
-%autosetup -n opa-psm2-PSM2_%{version}
+%autosetup -n opa-psm2-psm-v%{version}
 
 %build
 %{set_build_flags}
@@ -128,6 +130,10 @@ rm -f %{buildroot}%{_lib64dir}/*.a
 %{_sysconfdir}/modprobe.d/libpsm2-compat.conf
 
 %changelog
+* Tue Feb 13 2024 Aditya Dubey <adityadubey@microsoft.com> - 12.0-1
+- Upgrading to latest version for Mariner 3.0
+- Adding BuildRequires: perl and BuildRequires: systemd-rpm-macros
+
 * Thu Dec 07 2023 Andrew Phelps <anphel@microsoft.com> - 11.2.206-3
 - Fix build issue by using _libdir macro
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 43a56e5250..ac8c80c3c9 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -10561,8 +10561,8 @@
         "type": "other",
         "other": {
           "name": "libpsm2",
-          "version": "11.2.206",
-          "downloadUrl": "https://github.com/cornelisnetworks/opa-psm2/archive/refs/tags/PSM2_11.2.206.tar.gz"
+          "version": "12.0",
+          "downloadUrl": "https://github.com/cornelisnetworks/opa-psm2/archive/refs/tags/psm-v12.0.tar.gz"
         }
       }
     },