From faacb84829c35c03650af8fca242a50196f7e0b9 Mon Sep 17 00:00:00 2001
From: jykanase <v-jykanase@microsoft.com>
Date: Thu, 6 Feb 2025 13:01:15 +0530
Subject: [PATCH] exempi: Update version to 2.6.5 (#10796)

---
 .../exempi/exempi-e23c213-typeinfos.patch     | 27 -------------------
 SPECS-EXTENDED/exempi/exempi.signatures.json  |  2 +-
 SPECS-EXTENDED/exempi/exempi.spec             | 20 +++++++++++---
 cgmanifest.json                               |  6 ++---
 4 files changed, 21 insertions(+), 34 deletions(-)
 delete mode 100644 SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch

diff --git a/SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch b/SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch
deleted file mode 100644
index 0e05bf30a87..00000000000
--- a/SPECS-EXTENDED/exempi/exempi-e23c213-typeinfos.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
-Date: Tue, 12 Oct 2021 14:15:17 +0200
-Subject: [PATCH] Avoid multiple definitions of typeinfos
-
----
- XMPFiles/source/XMPFiles_Impl.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp
-index 2f918ac..ff45040 100644
---- a/XMPFiles/source/XMPFiles_Impl.cpp
-+++ b/XMPFiles/source/XMPFiles_Impl.cpp
-@@ -47,7 +47,9 @@ using namespace std;
- /// This file ...
- ///
- // =================================================================================================
--#include "public/include/XMP.incl_cpp"
-+#if ! XMP_StaticBuild
-+	#include "public/include/XMP.incl_cpp"
-+#endif
- 
- #if XMP_WinBuild
- 	#pragma warning ( disable : 4290 )	// C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
--- 
-2.33.0
-
diff --git a/SPECS-EXTENDED/exempi/exempi.signatures.json b/SPECS-EXTENDED/exempi/exempi.signatures.json
index 12d94b1638f..5e51db63383 100644
--- a/SPECS-EXTENDED/exempi/exempi.signatures.json
+++ b/SPECS-EXTENDED/exempi/exempi.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "exempi-2.6.1.tar.bz2": "49f2172d2e9c601c4ee89b7f6c4b50f328ba1f2c165bdeab949b7de8c8223517"
+  "exempi-2.6.5.tar.bz2": "90b4c4cdde841402a7839b54add679e9d2ef749ea5f1f82fdcc2d0122d889123"
  }
 }
diff --git a/SPECS-EXTENDED/exempi/exempi.spec b/SPECS-EXTENDED/exempi/exempi.spec
index 738da3b61d0..c0494aff936 100644
--- a/SPECS-EXTENDED/exempi/exempi.spec
+++ b/SPECS-EXTENDED/exempi/exempi.spec
@@ -1,13 +1,16 @@
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
-Version:	2.6.1
-Release:	2%{?dist}
+Version:	2.6.5
+Release:	1%{?dist}
 License:	BSD
+Vendor:         Microsoft Corporation
+Distribution:   Azure Linux
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
 Source0:	https://gitlab.freedesktop.org/libopenraw/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
-Patch0:		exempi-e23c213-typeinfos.patch
+
 BuildRequires:	gcc-c++
 BuildRequires:	boost-devel expat-devel zlib-devel pkgconfig
+
 # Work around for aarch64 support (https://bugzilla.redhat.com/show_bug.cgi?id=925327)
 BuildRequires:	autoconf automake libtool
 BuildRequires: make
@@ -42,8 +45,15 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %make_build
 
+
 %check
+%ifarch s390x
+# testcore test fails on big endian arches since exempi 2.5.2:
+# https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/23
+make check || [ "$(grep '^FAIL:' exempi/test-suite.log)" = "FAIL: tests/testcore" ]
+%else
 make check
+%endif
 
 %install
 %make_install
@@ -64,6 +74,10 @@ rm -rf %{buildroot}%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Oct 21 2024 Jyoti kanase <v-jykanase@microsoft.com> - 2.6.5-1
+- Update to version 2.6.5
+- License verified
+
 * Tue Aug 16 2022 Olivia Crain <oliviacrain@microsoft.com> - 2.6.1-2
 - Bump to rebuild with zlib 1.2.1-2 (fixes CVE-2022-37434)
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 2d331bb98e8..59aeecbce8a 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -3408,9 +3408,9 @@
         "type": "other",
         "other": {
           "name": "exempi",
-          "version": "2.6.1",
-          "downloadUrl": "https://gitlab.freedesktop.org/libopenraw/exempi/-/archive/2.6.1/exempi-2.6.1.tar.bz2"
-        }
+          "version": "2.6.5",
+          "downloadUrl": "https://gitlab.freedesktop.org/libopenraw/exempi/-/archive/2.6.5/exempi-2.6.5.tar.bz2"        
+	}
       }
     },
     {