From 56d4420af0397f84dbddb629e477b75ef5fb23a6 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 15 Nov 2021 09:10:09 +0100 Subject: [PATCH] Remove RPATH Resolves: bz#2018421 --- exiv2-no-rpath.patch | 13 +++++++++++++ exiv2.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 exiv2-no-rpath.patch diff --git a/exiv2-no-rpath.patch b/exiv2-no-rpath.patch new file mode 100644 index 0000000..09ff0ef --- /dev/null +++ b/exiv2-no-rpath.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake +index fcaa21f..f69fc46 100644 +--- a/cmake/mainSetup.cmake ++++ b/cmake/mainSetup.cmake +@@ -23,8 +23,6 @@ if (UNIX) + if (APPLE) + set(CMAKE_MACOSX_RPATH ON) + set(CMAKE_INSTALL_RPATH "@loader_path") +- else() +- join_paths(CMAKE_INSTALL_RPATH "$ORIGIN" ".." "${CMAKE_INSTALL_LIBDIR}") + endif() + endif() + diff --git a/exiv2.spec b/exiv2.spec index cc70b81..2196ee3 100644 --- a/exiv2.spec +++ b/exiv2.spec @@ -5,7 +5,7 @@ Summary: Exif and Iptc metadata manipulation library Name: exiv2 Version: 0.27.5 %global internal_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.exiv2.org/ @@ -20,6 +20,7 @@ Source0: http://exiv2.org/builds/%{name}-%{version}-Source.tar.gz ## security fixes ## upstreamable patches +Patch0: exiv2-no-rpath.patch BuildRequires: cmake BuildRequires: expat-devel @@ -124,6 +125,10 @@ test -x %{buildroot}%{_libdir}/libexiv2.so %changelog +* Mon Nov 15 2021 Jan Grulich - 0.27.5-2 +- Remove RPATH + Resolves: bz#2018421 + * Fri Nov 12 2021 Jan Grulich - 0.27.5-1 - Exiv2 0.27.5 Resolves: bz#2018421