diff --git a/.gitignore b/.gitignore index 8e25fd0..59dd632 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -php4-r1190.tar.gz -rrdtool-*.tar.gz +/php4-r1190.tar.gz +/rrdtool-*.tar.gz diff --git a/rrdtool.spec b/rrdtool.spec index 5bd1118..80df5fb 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: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ with exceptions URL: https://oss.oetiker.ch/rrdtool/ Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz @@ -30,21 +30,33 @@ Patch3: rrdtool-1.6.0-ruby-2-fix.patch # enable php bindings on ppc Patch4: rrdtool-1.4.8-php-ppc-fix.patch +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: freetype-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel +BuildRequires: intltool >= 0.35.0 +BuildRequires: cairo-devel >= 1.4.6 +BuildRequires: pango-devel >= 1.17 +BuildRequires: libtool +BuildRequires: groff +BuildRequires: gettext +BuildRequires: libxml2-devel +BuildRequires: systemd +BuildRequires: sed +%if %{with_dbi} +BuildRequires: libdbi-devel +%endif +BuildRequires: perl-ExtUtils-MakeMaker +BuildRequires: perl-generators +BuildRequires: perl-Pod-Html +BuildRequires: perl-devel +BuildRequires: automake +BuildRequires: autoconf Requires: dejavu-sans-mono-fonts Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: make -BuildRequires: gcc-c++, 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 -%if %{with_dbi} -BuildRequires: libdbi-devel -%endif -BuildRequires: perl-ExtUtils-MakeMaker, perl-generators, perl-Pod-Html, perl-devel -BuildRequires: automake, autoconf %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -213,6 +225,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 +410,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Thu May 13 2021 Jaroslav Škarvada - 1.7.2-17 +- Removed rpath from python bindings + * Wed Jan 27 2021 Fedora Release Engineering - 1.7.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild