diff --git a/backport-set-LD_LIBRARY_PATH-on-linux.patch b/backport-set-LD_LIBRARY_PATH-on-linux.patch new file mode 100644 index 0000000000000000000000000000000000000000..6cda363e32cd5f95b78382024b83c201c97ba488 --- /dev/null +++ b/backport-set-LD_LIBRARY_PATH-on-linux.patch @@ -0,0 +1,36 @@ +From c11b4b3912431f2d84693b5ae3523728eef40510 Mon Sep 17 00:00:00 2001 +From: Ryan Carsten Schmidt +Date: Tue, 16 Jan 2024 16:12:23 -0600 +Subject: [PATCH] Tests: Set DYLD_LIBRARY_PATH (fix #52) + +This allows the tests to find the just-built copy of libpaper.dylib on +macOS when not using --enable-relocatable. +--- + tests/Makefile.am | 1 + + tests/run-test | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index e9d8646..1cde732 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -89,6 +89,7 @@ AM_TESTS_ENVIRONMENT = \ + export prefix=$(prefix); \ + export sysconfdir=$(sysconfdir); \ + export bindir=$(bindir); \ ++ export libdir=$(libdir); \ + export abs_srcdir=$(abs_srcdir); \ + export DIFF=$(DIFF); \ + export PATH_CONVERT=$(PATH_CONVERT); \ +diff --git a/tests/run-test b/tests/run-test +index a1a8ea0..54f8cc2 100755 +--- a/tests/run-test ++++ b/tests/run-test +@@ -105,6 +105,7 @@ no_home() { + cd .. + ${MAKE} install DESTDIR="$test_dir" + export PATH="$test_dir/$bindir:$PATH" ++export DYLD_LIBRARY_PATH="$test_dir/$libdir" + cd "$test_dir" + + # Set up paper configuration diff --git a/libpaper.spec b/libpaper.spec index 4ea0b0f48ab0e514fcfc60aa1196cbc255d452bb..21dd0883fc08a2487ff487f7195d2c9deb097fcb 100644 --- a/libpaper.spec +++ b/libpaper.spec @@ -1,12 +1,14 @@ Name: libpaper Version: 2.2.6 -Release: 1 +Release: 2 Summary: Library for handling paper characteristics License: LGPL-2.1-or-later and GPL-3.0-or-later AND LGPL-2.0-or-later URL: https://github.com/rrthomas/libpaper Source0: https://github.com/rrthomas/libpaper/archive/v%{version}/%{name}-%{version}.tar.gz Source1: localepaper.c - + +Patch1: backport-set-LD_LIBRARY_PATH-on-linux.patch + BuildRequires: gcc, libtool, gettext, gawk %description @@ -65,6 +67,9 @@ install -m0755 src/localepaper %{buildroot}%{_libexecdir} %{_mandir}/man5/* %changelog +* Mon Jul 21 2025 liuzhilin - 2.2.6-2 +- backport run-test: set LD_LIBRARY_PATH on Linux, to use correct libraries + * Thu Jan 23 2025 Funda Wang - 2.2.6-1 - update to 2.2.6