From ecf2a3cf6e6f4b7b1c9cfa56c3371d219b5d029c Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 13 Jan 2024 14:34:00 +0100
Subject: [PATCH] - updated to 0.28.1 (fixes CVE-2023-44398)

---
 exiv2-no-xmpsdk-install.patch | 24 ------------------------
 exiv2.spec                    | 12 +++++-------
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 exiv2-no-xmpsdk-install.patch

diff --git a/exiv2-no-xmpsdk-install.patch b/exiv2-no-xmpsdk-install.patch
deleted file mode 100644
index 67c64f4..0000000
--- a/exiv2-no-xmpsdk-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-We package shared, not static libexiv2 library, so libexiv2-xmp.a is useless.
---- exiv2-0.27.4-Source/xmpsdk/CMakeLists.txt.orig	2021-08-18 17:34:28.084628433 +0200
-+++ exiv2-0.27.4-Source/xmpsdk/CMakeLists.txt	2021-08-18 17:35:29.887626951 +0200
-@@ -48,10 +48,3 @@ endif()
- if (BUILD_SHARED_LIBS)
-     set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
- endif()
--
--# The private dependencies of a static library still need to be exported because they are needed to properly link the consumers of the static library.
--install(TARGETS exiv2-xmp EXPORT exiv2Config	
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}	
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}	
--    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--)
---- exiv2-0.28.0-Source/src/CMakeLists.txt.orig	2023-05-08 18:01:13.000000000 +0200
-+++ exiv2-0.28.0-Source/src/CMakeLists.txt	2023-07-25 21:19:24.740194972 +0200
-@@ -189,7 +189,6 @@ endif()
- 
- if (EXIV2_ENABLE_XMP)
-     target_link_libraries(exiv2lib PRIVATE exiv2-xmp)
--    list(APPEND libs_private_list "exiv2-xmp")
- elseif(EXIV2_ENABLE_EXTERNAL_XMP)
-     target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY})
-     target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR})
diff --git a/exiv2.spec b/exiv2.spec
index 90d0b91..ed5c2de 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -6,14 +6,13 @@
 Summary:	EXIF and IPTC metadata manipulation tools
 Summary(pl.UTF-8):	Narzędzia do obróbki metadanych EXIF i IPTC
 Name:		exiv2
-Version:	0.28.0
+Version:	0.28.1
 Release:	1
 License:	GPL v2+
 Group:		Applications/Graphics
 #Source0Download: https://exiv2.org/download.html
-Source0:	https://github.com/Exiv2/exiv2/releases/download/v%{version}/%{name}-%{version}-Source.tar.gz
-# Source0-md5:	7b53f59708efc7f9840e34503eacb41f
-Patch0:		%{name}-no-xmpsdk-install.patch
+Source0:	https://github.com/Exiv2/exiv2/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	c4d05b86bda11c15163903822d0eebfb
 URL:		https://exiv2.org/
 BuildRequires:	cmake >= 3.11.0
 %{?with_curl:BuildRequires:	curl-devel}
@@ -77,8 +76,7 @@ API documentation for exiv2 library.
 Dokumentacja API biblioteki exiv2.
 
 %prep
-%setup -q -n %{name}-%{version}-Source
-%patch0 -p1
+%setup -q
 
 %build
 install -d build
@@ -129,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libexiv2.so
 %{_includedir}/exiv2
 %{_pkgconfigdir}/exiv2.pc
-%{_libdir}/cmake/exiv2
+%{_datadir}/cmake/exiv2
 
 %if %{with apidocs}
 %files apidocs
-- 
2.44.0