diff --git a/rrdtool-1.7.2-python-rpath-fix.patch b/rrdtool-1.7.2-python-rpath-fix.patch deleted file mode 100644 index c44333a..0000000 --- a/rrdtool-1.7.2-python-rpath-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 72abba0..4f610c4 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -17,11 +17,11 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.7.2 -Release: 23%{?dist} +Version: 1.8.0 +Release: 1%{?dist} License: GPLv2+ with exceptions URL: https://oss.oetiker.ch/rrdtool/ -Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz +Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: php4-%{svnrev}.tar.gz Patch1: rrdtool-1.4.4-php54.patch # disable logo for php 5.5. @@ -29,7 +29,6 @@ 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 BuildRequires: make BuildRequires: gcc-c++ @@ -178,7 +177,6 @@ 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' \ @@ -408,6 +406,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Tue Mar 22 2022 Jaroslav Škarvada - 1.8.0-1 +- New version + Resolves: rhbz#2065186 + * Thu Jan 27 2022 Mamoru TASAKA - 1.7.2-23 - F-36: rebuild against ruby31 diff --git a/sources b/sources index eeb42b1..4ad093c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rrdtool-1.7.2.tar.gz) = 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 SHA512 (php4-r1190.tar.gz) = 5fe8f3798abe50553a825ca8358c0d44af389ce5e5ae219c26da70e39f982fce95ad49ef620d03dd4a4a575e7a75d2f569c2013a250f2bcd16c3b2a5322a8eb7 +SHA512 (rrdtool-1.8.0.tar.gz) = 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1