.gitignore

@@ -1,2 +1,4 @@
-php4-r1190.tar.gz
+SOURCES/php4-r1190.tar.gz
-rrdtool-*.tar.gz
+SOURCES/rrdtool-1.7.0.tar.gz
+/php4-r1190.tar.gz
+/rrdtool-1.7.0.tar.gz

gating.yaml

@@ -1,7 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}

rrdtool-1.7.0-fix-configure-parameters.patch

@@ -0,0 +1,49 @@
+--- ./configure.ac.orig	2017-05-16 10:32:11.000000000 +0200
++++ ./configure.ac	2018-01-05 14:00:09.261806009 +0100
+@@ -512,7 +512,11 @@
+ 
+ have_libdbi=no
+ 
+-AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),[],[
++AC_ARG_ENABLE(libdbi,AS_HELP_STRING([--disable-libdbi],[do not build in support for libdbi]),
++[],
++[enable_libdbi=yes])
++
++AS_IF([test "x$enable_libdbi" != xno], [
+     AC_CHECK_HEADER(dbi/dbi.h, [
+        AC_CHECK_LIB(dbi, dbi_initialize, [
+            AC_DEFINE(HAVE_LIBDBI,[1],[have got libdbi installed])
+@@ -526,7 +530,11 @@
+ 
+ have_librados=no
+ 
+-AC_ARG_ENABLE(librados,AS_HELP_STRING([--disable-librados],[do not build in support for librados]),[],[
++AC_ARG_ENABLE(librados,AS_HELP_STRING([--disable-librados],[do not build in support for librados]),
++[],
++[enable_librados=yes])
++
++AS_IF([test "x$enable_librados" != xno], [
+     AC_CHECK_HEADER(rados/librados.h, [
+         AC_DEFINE(HAVE_LIBRADOS,[1],[have got librados installed])
+         LIBS="${LIBS} -lrados"
+@@ -538,7 +546,11 @@
+ 
+ have_libwrap=no
+ 
+-AC_ARG_ENABLE(libwrap, AS_HELP_STRING([--disable-libwrap], [do not build in support for libwrap (tcp wrapper)]),[],[
++AC_ARG_ENABLE(libwrap, AS_HELP_STRING([--disable-libwrap], [do not build in support for libwrap (tcp wrapper)]),
++[],
++[enable_libwrap=yes])
++
++AS_IF([test "x$enable_libwrap" != xno], [
+     AC_CHECK_HEADER(tcpd.h,[
+         AC_CHECK_FUNCS(hosts_access, [
+             AC_DEFINE(HAVE_LIBWRAP,[1],[have got libwrap installed])
+@@ -554,7 +566,6 @@
+     ])
+ ])
+ 
+-
+ AM_CONDITIONAL(BUILD_LIBWRAP,[test $have_libwrap != no])
+ 
+ AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no])

rrdtool-1.7.2-python-rpath-fix.patch

@@ -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} \

rrdtool.spec

@@ -1,3 +1,9 @@
+%if 0%{?rhel} > 7
+%global with_python2 %{?_without_python2: 0} %{?!_without_python2: 0}
+%else
+%global with_python2 %{?_without_python2: 0} %{?!_without_python2: 1}
+%endif
+
 %global with_python3 %{?_without_python3: 0} %{?!_without_python3: 1}
 %global with_php %{?_without_php: 0} %{?!_without_php: 0}
 %global with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
@@ -17,11 +23,12 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.7.2
+Version: 1.7.0
-Release: 21%{?dist}
+Release: 16%{?dist}
 License: GPLv2+ with exceptions
-URL: https://oss.oetiker.ch/rrdtool/
+Group: Applications/Databases
-Source0: https://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
+URL: http://oss.oetiker.ch/rrdtool/
+Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Source1: php4-%{svnrev}.tar.gz
 Patch1: rrdtool-1.4.4-php54.patch
 # disable logo for php 5.5.
@@ -29,18 +36,18 @@ 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
+# https://github.com/oetiker/rrdtool-1.x/issues/861
+Patch5: rrdtool-1.7.0-fix-configure-parameters.patch
 
 Requires: dejavu-sans-mono-fonts
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-BuildRequires: make
 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, sed
+BuildRequires: gettext, libxml2-devel, systemd
 %if %{with_dbi}
 BuildRequires: libdbi-devel
 %endif
@@ -58,6 +65,7 @@ put a friendly user interface on it.
 
 %package devel
 Summary: RRDtool libraries and header files
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -68,6 +76,7 @@ server load average). This package allow you to use directly this library.
 
 %package doc
 Summary: RRDtool documentation
+Group: Documentation
 
 %description doc
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -76,6 +85,7 @@ server load average). This package contains documentation on using RRD.
 
 %package perl
 Summary: Perl RRDtool bindings
+Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Obsoletes: perl-%{name} < %{version}-%{release}
@@ -84,20 +94,54 @@ Provides: perl-%{name} = %{version}-%{release}
 %description perl
 The Perl RRDtool bindings
 
+%if %{with_python2}
+# Make sure the runtime python is newer than the build one;
+# give a default value to handle parsing in cases when python is not present:
+%{!?rrd_python_version: %global rrd_python_version %(%{__python2} -c 'import sys; print sys.version.split(" ")[0]' || echo "3.14")}
+
+%package -n python2-rrdtool
+%{?python_provide:%python_provide python2-rrdtool}
+# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
+Summary: Python RRDtool bindings
+Group: Development/Languages
+BuildRequires: python2-devel, python2-setuptools
+Requires: python2 >= %{rrd_python_version}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: python-%{name} < %{version}-%{release}
+Provides: python-%{name} = %{version}-%{release}
+
+%description -n python2-rrdtool
+Python RRDtool bindings.
+%endif
+
+%if %{with_python3}
+# Make sure the runtime python is newer than the build one;
+# give a default value to handle parsing in cases when python is not present:
+%{!?rrd_python3_version: %global rrd_python3_version %(%{__python3} -c 'import sys; print(sys.version.split(" ")[0])' || echo "3.14")}
 
 %package -n python3-rrdtool
 %{?python_provide:%python_provide python3-rrdtool}
 Summary: Python RRDtool bindings
+Group: Development/Languages
 BuildRequires: python3-devel, python3-setuptools
-%{?__python3:Requires: %{__python3}}
 Requires: %{name} = %{version}-%{release}
+%if 0%{?rhel} > 7
+Requires: platform-python >= %{rrd_python3_version}
+%else
+Requires: python3 >= %{rrd_python3_version}
+%endif
 
 %description -n python3-rrdtool
 Python RRDtool bindings.
+%endif
 
 %if %{with_php}
 %package php
 Summary: PHP RRDtool bindings
+Group: Development/Languages
 BuildRequires: php-devel >= 4.0
 Requires: php >= 4.0
 Requires: %{name} = %{version}-%{release}
@@ -115,6 +159,7 @@ RRDtool bindings to the PHP HTML-embedded scripting language.
 %if %{with_tcl}
 %package tcl
 Summary: Tcl RRDtool bindings
+Group: Development/Languages
 BuildRequires: tcl-devel >= 8.0
 Requires: tcl >= 8.0
 Requires: %{name} = %{version}-%{release}
@@ -130,6 +175,7 @@ The %{name}-tcl package includes RRDtool bindings for Tcl.
 
 %package ruby
 Summary: Ruby RRDtool bindings
+Group: Development/Languages
 BuildRequires: ruby, ruby-devel
 Requires: %{name} = %{version}-%{release}
 
@@ -144,6 +190,7 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
 
 %package lua
 Summary: Lua RRDtool bindings
+Group: Development/Languages
 BuildRequires: lua, lua-devel
 %if "%{luaver}" != ""
 Requires: lua(abi) = %{luaver}
@@ -166,7 +213,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
+%patch5 -p1 -b .fix-configure-parameters
 
 # 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' \
@@ -184,7 +231,7 @@ perl -pi.orig -e 's|1.299907080300|1.29990708|' \
 #
 # fix config files for php4 bindings
 # workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
-cp -p /usr/lib/rpm/redhat/config.{guess,sub} php4/
+cp -p /usr/lib/rpm/config.{guess,sub} php4/
 
 %build
 ./bootstrap
@@ -197,7 +244,7 @@ cp -p /usr/lib/rpm/redhat/config.{guess,sub} php4/
 %else
     --disable-tcl \
 %endif
-%if %{with_python3}
+%if %{with_python2} || %{with_python3}
     --enable-python \
 %else
     --disable-python \
@@ -233,20 +280,27 @@ perl Makefile.PL INSTALLDIRS=vendor
 perl -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile
 popd
 
-%{make_build}
+#{__make} %{?_smp_mflags}
+make
 
 # Build the php module, the tmp install is required
 %if %{with_php}
 %global rrdtmp %{_tmppath}/%{name}-%{version}-tmpinstall
-%{__make} install DESTDIR="%{rrdtmp}"
+make install DESTDIR="%{rrdtmp}"
 pushd php4/
 
+%if %{with_python2}
+export PYTHON=%{__python2}
+%endif
+%if %{with_python3}
 export PYTHON=%{__python3}
+%endif
 
 %configure \
     --with-rrdtool="%{rrdtmp}%{_prefix}" \
     --disable-static
-%{make_build} PYTHON="$PYTHON"
+#{__make} %{?_smp_mflags}
+make PYTHON="$PYTHON"
 popd
 rm -rf %{rrdtmp}
 %endif
@@ -259,12 +313,22 @@ find examples/ -name "*.pl" \
 
 # Rebuild python
 pushd bindings/python
+%if %{with_python2}
+%py2_build
+%endif
+%if %{with_python3}
 %py3_build
+%endif
 popd
 
 %install
+%if %{with_python2}
+export PYTHON=%{__python2}
+%endif
+%if %{with_python3}
 export PYTHON=%{__python3}
-%{make_install} PYTHON="$PYTHON"
+%endif
+make DESTDIR="$RPM_BUILD_ROOT" PYTHON="$PYTHON" install
 
 # Install the php module
 %if %{with_php}
@@ -303,7 +367,12 @@ find examples/ -type f -exec chmod 0644 {} \;
 
 # Reinstall python
 pushd bindings/python
+%if %{with_python2}
+%py2_install
+%endif
+%if %{with_python3}
 %py3_install
+%endif
 popd
 
 # Clean up the buildroot
@@ -362,11 +431,19 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %{perl_vendorarch}/*.pm
 %attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
 
+%if %{with_python2}
+%files -n python2-rrdtool
+%doc bindings/python/COPYING bindings/python/README.md
+%{python2_sitearch}/rrdtool.so
+%{python2_sitearch}/rrdtool-*.egg-info
+%endif
 
+%if %{with_python3}
 %files -n python3-rrdtool
 %doc bindings/python/COPYING bindings/python/README.md
 %{python3_sitearch}/rrdtool*.so
 %{python3_sitearch}/rrdtool-*.egg-info
+%endif
 
 %if %{with_php}
 %files php
@@ -396,106 +473,17 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %endif
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-21
+* Thu Dec  6 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.0-16
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt to fix broken build
-  Related: rhbz#1991688
+  Related: rhbz#1636795
 
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-20
+* Wed Dec  5 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.0-15
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Wed May 26 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-19
-- Removed rpath from python bindings better way
-  Related: rhbz#1960385
-
-* Wed May 26 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-18
-- Removed rpath from python bindings
-  Resolves: rhbz#1960385
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-17
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 06 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.7.2-15
-- F-34: rebuild against ruby 3.0
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-14
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 23 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-12
-- Used macros for make
-
-* Tue Jun 30 2020 Miro Hrončok <mhroncok@redhat.com> - 1.7.2-11
-- Rebuilt for Lua 5.4
-
-* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.2-10
-- Perl 5.32 rebuild
-
-* Mon Jun  8 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-9
-- Fixed FTBFS
-  Resolves: rhbz#1845126
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.7.2-8
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 18 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.7.2-6
-- F-32: rebuild against ruby27
-
-* Fri Aug 30 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.2-5
-- Subpackage python2-rrdtool has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.2-4
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.2-2
-- Perl 5.30 rebuild
-
-* Mon May 27 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-1
-- New version
-  Resolves: rhbz#1714347
-- Dropped compile-fix patch (upstreamed)
-
-* Tue Feb  5 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.1-1
-- New version
-  Resolves: rhbz#1672309
-- Dropped fix-configure-parameters patch (upstreamed)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.7.0-20
-- F-30: rebuild against ruby26
-
-* Wed Dec  5 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.0-19
 - Dropped useless Makefile in examples/rrdcached
+  Resolves: rhbz#1636795
 
-* Thu Sep 27 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.0-18
+* Tue Sep 25 2018 Tomas Orsava <torsava@redhat.com> - 1.7.0-14
-- Introduced python3 change requested by python team
+- Require Platform-Python on RHEL
-
+- Resolves: rhbz#1633608
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 04 2018 Petr Pisar <ppisar@redhat.com> - 1.7.0-16
-- Perl 5.28 rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1.7.0-15
-- Rebuilt for Python 3.7
-
-* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.7.0-14
-- Perl 5.28 rebuild
 
 * Tue Jun 19 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.0-13
 - Added support for python3

sources

@@ -1,2 +1,2 @@
-SHA512 (rrdtool-1.7.2.tar.gz) = 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 SHA512 (php4-r1190.tar.gz) = 5fe8f3798abe50553a825ca8358c0d44af389ce5e5ae219c26da70e39f982fce95ad49ef620d03dd4a4a575e7a75d2f569c2013a250f2bcd16c3b2a5322a8eb7
+SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f