Update to version 2.6.3

- resolves #2152330
This commit is contained in:
Nikola Forró 2022-12-14 08:18:19 +01:00
parent cbce8206d2
commit 56f777f96d
4 changed files with 8 additions and 31 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ exempi-2.1.1.tar.gz
/exempi-e23c21380f467f1f1c9dc397e0a08405fb4afa7a.tar.bz2
/exempi-2.6.1.tar.bz2
/exempi-2.6.2.tar.bz2
/exempi-2.6.3.tar.bz2

View File

@ -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

View File

@ -1,11 +1,10 @@
Summary: Library for easy parsing of XMP metadata
Name: exempi
Version: 2.6.2
Release: 2%{?dist}
Version: 2.6.3
Release: 1%{?dist}
License: BSD
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)
@ -70,6 +69,10 @@ rm -rf %{buildroot}%{_libdir}/*.a
%{_libdir}/pkgconfig/*.pc
%changelog
* Mon Dec 12 2022 Nikola Forró <nforro@redhat.com> - 2.6.3-1
- Update to version 2.6.3
Resolves #2152330
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (exempi-2.6.2.tar.bz2) = a438177d6b51b383ba56765d73857fe7faf7c396d970448fe747510724ddd971b2696715d88b8b529c16aba78aebc2c38e0cc7f25c691c4de729d6b78766a100
SHA512 (exempi-2.6.3.tar.bz2) = 1bbd888186f90d6f24eee108ae0b068f10125e648a75ebdf469ed3b2e6f8cf09d6abfe8ddb4484982f91a3dc393d505dd7404789cc81a41fe24ceed58f5b98f4