- updated to 1.11.0, partial PLD merge

diff --git a/groff.patch b/groff.patch
deleted file mode 100644 (file)
index f84c708..0000000
--- a/groff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur rrdtool-1.7.2.orig/doc/Makefile.am rrdtool-1.7.2/doc/Makefile.am
---- rrdtool-1.7.2.orig/doc/Makefile.am 2019-02-04 14:54:27.000000000 +0100
-+++ rrdtool-1.7.2/doc/Makefile.am      2019-08-21 23:26:57.942000000 +0200
-@@ -62,7 +62,7 @@
-       $(AM_V_GEN)@POD2MAN@ --release=$(VERSION) --center=rrdtool --section=3 $< > $@
- 
- .1.txt .3.txt:
--      $(AM_V_GEN)GROFF_NO_SGR=1 @NROFF@ -man -Tlp -Wbreak $< > $@
-+      $(AM_V_GEN)GROFF_NO_SGR=1 @NROFF@ -man -Tlp  $< > $@
- 
- .1.pdf .3.pdf:
-       $(AM_V_GEN)@TROFF@ -man $< | ps2pdf - $@

diff --git a/rrdtool.spec b/rrdtool.spec
index da754f779fa90a971ca253e25219d6db7d94666e..28722630283b40b9af53dd1573bff1c01ffb8571 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -15,11 +15,6 @@
 %undefine      with_rrdcgi
 %endif
 
-# ceph >= 14.0 no longer support 32-bit archs
-%ifarch %{ix86}
-%undefine      with_ceph
-%endif
-
 %define        pdir    RRDp
 Summary:       RRDtool - round robin database
 Summary(pl.UTF-8):     RRDtool - baza danych typu round-robin
@@ -27,28 +22,29 @@ Summary(pt_BR.UTF-8):       Round Robin Database, uma ferramenta para construção de
 Summary(ru.UTF-8):     RRDtool - база данных с "циклическим обновлением"
 Summary(uk.UTF-8):     RRDtool - це система зберігання та показу серійних даних
 Name:          rrdtool
-Version:       1.9.0
+Version:       1.11.0
 Release:       1
 License:       GPL v2+ + FLOSS exception
 Group:         Applications/Databases
 Source0:       https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: bcbdb069e74fc866fb92deb6697c5392
+# Source0-md5: 289fa4c8f31db4626deddb6603ee117e
 Source1:       rrdcached.init
 Source2:       rrdcached.sysconfig
 Patch0:                %{name}-tcl-path.patch
-Patch1:                groff.patch
+Patch1:                python-path.patch
 URL:           http://oss.oetiker.ch/rrdtool/
-BuildRequires: autoconf >= 2.60
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 %{?with_ceph:BuildRequires:    ceph-devel}
 BuildRequires: gettext-tools >= 0.18
 BuildRequires: glib2-devel >= 1:2.28.7
 BuildRequires: groff
 BuildRequires: libdbi-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: libwrap-devel
 BuildRequires: libxml2-devel >= 1:2.7.8
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.745
 %if %{with rrd_graph}
@@ -67,6 +63,7 @@ BuildRequires:        rpm-perlprov
 %if %{with python}
 BuildRequires: python3
 BuildRequires: python3-devel
+BuildRequires: python3-pip
 %endif
 %if %{with ruby}
 BuildRequires: rpm-rubyprov
@@ -275,7 +272,7 @@ Summary(pl.UTF-8):  Pythonowy interfejs do RRDtoola
 Group:         Development/Languages/Python
 Requires:      %{name} = %{version}-%{release}
 Requires:      python3-libs
-Obsoletes:     python-rrdtool
+Obsoletes:     python-rrdtool < 1.7.2-4
 
 %description -n python3-rrdtool
 Python 3 interface to RRDtool, the graphing and logging utility.
@@ -319,10 +316,10 @@ Rozszerzenie Tcl-a pozwalające na dostęp do biblioteki Tcl.
 %{__sed} -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
-      examples/stripes.py
+       examples/stripes.py
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+tclsh@TCL_VERSION@(\s|$),#!%{__tclsh}\1,' \
-      bindings/tcl/ifOctets.tcl.in
+       bindings/tcl/ifOctets.tcl.in
 
 # We only want .txt and .html files for the main documentation
 install -d docs/{html,/txt}
@@ -360,7 +357,7 @@ install -d perl-docs/html
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_examplesdir}/%{name}-%{version},%{ruby_archdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -383,6 +380,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rrdcached
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RRDs/.packlist
 %endif
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -409,7 +408,7 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del rrdcached
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS COPYRIGHT NEWS THREADS TODO
 %attr(755,root,root) %{_libdir}/librrd.so.*.*.*
@@ -476,7 +475,7 @@ fi
 %if %{with lua}
 %files -n lua-rrdtool
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lua/5.*/rrd.so*
+%{_libdir}/lua/5.*/rrd.so*
 %{_mandir}/man1/rrdlua.1*
 %endif
 
@@ -487,7 +486,7 @@ fi
 %{perl_vendorlib}/RRDp.pm
 %{perl_vendorarch}/RRDs.pm
 %dir %{perl_vendorarch}/auto/RRDs
-%attr(755,root,root) %{perl_vendorarch}/auto/RRDs/RRDs.so
+%{perl_vendorarch}/auto/RRDs/RRDs.so
 %{_mandir}/man3/RRDp.3*
 %{_mandir}/man3/RRDs.3*
 %endif
@@ -495,19 +494,21 @@ fi
 %if %{with python}
 %files -n python3-rrdtool
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py3_sitedir}/rrdtool*.so
-%{py3_sitedir}/rrdtool-*.egg-info
+%{py3_sitedir}/rrdtool*.so
+%{py3_sitedir}/rrdtool-*.dist-info
+%{_mandir}/man1/rrdpython.1*
 %endif
 
 %if %{with ruby}
 %files -n ruby-rrdtool
 %defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_archdir}/RRD.so
+%{ruby_archdir}/RRD.so
+%{_mandir}/man1/rrdruby.1*
 %endif
 
 %if %{with tcl}
 %files -n tcl-rrdtool
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/tclrrd%{version}.so
+%{_libdir}/tclrrd%{version}.so
 %{_prefix}/lib/tclrrd%{version}
 %endif