diff --git a/rrdtool-1.7.2-python-rpath-fix.patch b/rrdtool-1.7.2-python-rpath-fix.patch new file mode 100644 index 0000000..c44333a --- /dev/null +++ b/rrdtool-1.7.2-python-rpath-fix.patch @@ -0,0 +1,12 @@ +diff --git a/bindings/Makefile.am b/bindings/Makefile.am +index 3632b3c..cd1df6a 100644 +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -69,7 +69,6 @@ python: + && env \ + ABS_TOP_SRCDIR=${abs_top_srcdir} \ + ABS_TOP_BUILDDIR=${abs_top_builddir} \ +- LD_RUN_PATH=$(libdir) \ + $(PYTHON) ${abs_srcdir}/$@/setup.py build_ext $(PYTHON_RPATH) \ + && env \ + ABS_TOP_SRCDIR=${abs_top_srcdir} \ diff --git a/rrdtool.spec b/rrdtool.spec index 67d65eb..31097d9 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: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ with exceptions URL: https://oss.oetiker.ch/rrdtool/ Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz @@ -29,6 +29,7 @@ Patch2: rrdtool-1.4.7-php55.patch Patch3: rrdtool-1.6.0-ruby-2-fix.patch # enable php bindings on ppc Patch4: rrdtool-1.4.8-php-ppc-fix.patch +Patch5: rrdtool-1.7.2-python-rpath-fix.patch Requires: dejavu-sans-mono-fonts Requires(post): systemd @@ -165,6 +166,7 @@ The %{name}-lua package includes RRDtool bindings for Lua. %patch3 -p1 -b .ruby-2-fix %endif %patch4 -p1 -b .php-ppc-fix +%patch5 -p1 -b .python-rpath-fix # Fix to find correct python dir on lib64 perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \ @@ -213,10 +215,6 @@ 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 @@ -398,6 +396,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Wed May 26 2021 Jaroslav Škarvada - 1.7.2-19 +- Removed rpath from python bindings better way + Related: rhbz#1960385 + * Wed May 26 2021 Jaroslav Škarvada - 1.7.2-18 - Removed rpath from python bindings Resolves: rhbz#1960385