diff --git a/libburn-1.5.4-rpath.patch b/libburn-1.5.4-rpath.patch new file mode 100644 index 0000000..e5b5bf3 --- /dev/null +++ b/libburn-1.5.4-rpath.patch @@ -0,0 +1,20 @@ +Patch by Robert Scheck for libburn >= 1.5.4 to work around the Debian +specific aclocal/libtool behaviour not covering /usr/lib64 or /lib64 paths for 64 bit libraries. + +--- libburn-1.5.4/configure 2021-01-30 13:00:19.000000000 +0100 ++++ libburn-1.5.4/configure.rpath 2021-07-23 02:56:57.399348305 +0200 +@@ -11219,10 +11219,13 @@ + # before this can be enabled. + hardcode_into_libs=yes + ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/libburn.spec b/libburn.spec index 4ff7692..b33c36c 100644 --- a/libburn.spec +++ b/libburn.spec @@ -10,6 +10,7 @@ Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{versi Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig Source2: gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg Patch0: libburn-0.6.16-multilib.patch +Patch1: libburn-1.5.4-rpath.patch BuildRequires: gnupg2 BuildRequires: gcc, make, intltool, gettext %if 0%{?rhel} && "%{name}" != "%{pkgname}" @@ -61,6 +62,7 @@ features from the command line. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n %{pkgname}-%{version} %patch0 -p1 -b .multilib +%patch1 -p1 -b .rpath # Rename from libburn to libburn1 for EPEL %if 0%{?rhel} && "%{name}" != "%{pkgname}"