From a5a9c6d3930b33a3798ce0d759473c6bbe2cd9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 26 May 2021 18:22:54 +0200 Subject: [PATCH] Removed rpath from python bindings Resolves: rhbz#1960385 --- rrdtool.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rrdtool.spec b/rrdtool.spec index 150edde..67d65eb 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -18,7 +18,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.7.2 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ with exceptions URL: https://oss.oetiker.ch/rrdtool/ Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz @@ -39,7 +39,7 @@ BuildRequires: gcc-c++, openssl-devel, freetype-devel BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0 BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17 BuildRequires: libtool, groff -BuildRequires: gettext, libxml2-devel, systemd +BuildRequires: gettext, libxml2-devel, systemd, sed %if %{with_dbi} BuildRequires: libdbi-devel %endif @@ -213,6 +213,10 @@ cp -p /usr/lib/rpm/redhat/config.{guess,sub} php4/ --disable-static \ --with-pic +# Remove rpath from python +sed -i 's|\bsetup.py build_ext\b|setup.py build_ext -R '"''"'|g' \ + bindings/Makefile + # Fix another rpath issue perl -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \ bindings/perl-shared/Makefile.PL @@ -394,6 +398,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Wed May 26 2021 Jaroslav Škarvada - 1.7.2-18 +- Removed rpath from python bindings + Resolves: rhbz#1960385 + * Fri Apr 16 2021 Mohan Boddu - 1.7.2-17 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937