From 23345507d98401dbc69d4271f375f5eff7b01ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Mon, 13 Sep 2021 15:55:20 +0200
Subject: [PATCH] Update to (unreleased) version 2.5.3 to resolve licensing
 issues

---
 .gitignore  |  1 +
 exempi.spec | 18 +++++++++++++-----
 sources     |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbfcbae..15d8049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ exempi-2.1.1.tar.gz
 /exempi-2.4.4.tar.bz2
 /exempi-2.4.5.tar.bz2
 /exempi-2.5.1.tar.bz2
+/exempi-2062d44dadbc603524ed0ffdb752070455b7e7fa.tar.bz2
diff --git a/exempi.spec b/exempi.spec
index 29f94cc..9c66cd0 100644
--- a/exempi.spec
+++ b/exempi.spec
@@ -1,10 +1,15 @@
+%global commit 2062d44dadbc603524ed0ffdb752070455b7e7fa
+%global shortcommit %%(c=%{commit}; echo ${c:0:7})
+%global date 20210917
+
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
-Version:	2.5.1
-Release:	7%{?dist}
+Version:	2.5.3
+Release:	0.1.%{date}git%{shortcommit}%{?dist}
 License:	BSD
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
-Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
+# Temporary fork until a new upstream version of exempi is released
+Source0:	https://gitlab.freedesktop.org/nforro/%{name}/-/archive/%{commit}/%{name}-%{commit}.tar.bz2
 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)
@@ -27,13 +32,13 @@ This package contains the libraries and header files needed for
 developing with exempi.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{commit}
 
 %build
 libtoolize -vi
 NOCONFIGURE=1 ./autogen.sh
 # BanEntityUsage needed for #888765
-%configure CPPFLAGS="-I%{_includedir} -fno-strict-aliasing -DBanAllEntityUsage=1 -std=c++14"
+%configure CPPFLAGS="-I%{_includedir} -fno-strict-aliasing -DBanAllEntityUsage=1"
 
 # Disable rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -62,6 +67,9 @@ rm -rf %{buildroot}%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 17 2021 Nikola Forró <nforro@redhat.com> - 2.5.3-0.2.20210917git2062d44
+- Update to (unreleased) version 2.5.3 to resolve licensing issues
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index ddfad2f..2067fde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (exempi-2.5.1.tar.bz2) = 97f2a688e1f92e219d0b68b077608112373cf3e6cbfe4141bbb9c3d1f416926bfd568957c1d0a081b95b524cbd500da0b7bca0ce45e1e8611818f66bcb1b6518
+SHA512 (exempi-2062d44dadbc603524ed0ffdb752070455b7e7fa.tar.bz2) = 03a35ad07b6ec364af72314ce54be62d6515b60615e5c49349df76bcb9f049181220819924e57a72675acee75ef84d2260f512652c030a14b7811fec721ba1dc