From 4b3a83bc7f00b7e6a65ee06ab554848470538c1d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 6 Aug 2024 13:35:19 +0200 Subject: [PATCH] Backport RHEL9 patch for RPATH Resolves: RHEL-45267 --- exiv2-no-rpath.patch | 13 +++++++++++++ exiv2.spec | 8 +++++++- 2 files changed, 20 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..f97d106 --- /dev/null +++ b/exiv2-no-rpath.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake +index 1ea9deb..36253d1 100644 +--- a/cmake/mainSetup.cmake ++++ b/cmake/mainSetup.cmake +@@ -26,8 +26,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 abbac06..d08d58f 100644 --- a/exiv2.spec +++ b/exiv2.spec @@ -1,6 +1,6 @@ Name: exiv2 Version: 0.28.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Exif and Iptc metadata manipulation library # GPL-2.0-or-later: main library @@ -20,6 +20,8 @@ Source: %{vcs}/archive/v%{version}-%{beta}/%{name}-%{version}-%{beta}.ta Source: %{vcs}/archive/v%{version}/%{name}-%{version}.tar.gz %endif +Patch0: exiv2-no-rpath.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gettext @@ -143,6 +145,10 @@ test -x %{buildroot}%{_libdir}/libexiv2.so %changelog +* Tue Aug 06 2024 Jan Grulich - 0.28.3-2 +- Backport RHEL9 patch for RPATH + Resolves: RHEL-45267 + * Tue Aug 06 2024 Jan Grulich - 0.28.3-1 - 0.28.3 Resolves: RHEL-45267