- partial PLD merge

[packages/rrdtool.git] / rrdtool.spec

diff --git a/rrdtool.spec b/rrdtool.spec
index 24cc7bb586780366f5ddaac024fed8547dd1488a..caeb8c89544948b4a1727ab50077d634e9c83b0d 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -15,22 +15,27 @@
 %undefine      with_rrdcgi
 %endif
 
+# ceph >= 14.0 no longer support 32-bit archs
+%ifarch %{ix86}
+%undefine      with_ceph
+%endif
+
 %define        pdir    RRDp
-%include       /usr/lib/rpm/macros.perl
 Summary:       RRDtool - round robin database
 Summary(pl.UTF-8):     RRDtool - baza danych typu round-robin
 Summary(pt_BR.UTF-8):  Round Robin Database, uma ferramenta para construção de gráficos
 Summary(ru.UTF-8):     RRDtool - база данных с "циклическим обновлением"
 Summary(uk.UTF-8):     RRDtool - це система зберігання та показу серійних даних
 Name:          rrdtool
-Version:       1.5.5
-Release:       1
+Version:       1.7.2
+Release:       2
 License:       GPL v2+ + FLOSS exception
 Group:         Applications/Databases
-Source0:       http://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5: d8b3dcb3d193c2d6ad0a282bde69ee11
+Source0:       https://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
+# Source0-md5: 638e3a0a1609d97e9f82e8832759dcd2
 Patch0:                %{name}-tcl-path.patch
 Patch1:                %{name}-missing.patch
+Patch2:                groff.patch
 URL:           http://oss.oetiker.ch/rrdtool/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -63,6 +68,7 @@ BuildRequires:        python >= 1:2.3
 BuildRequires: python-devel >= 1:2.3
 %endif
 %if %{with ruby}
+BuildRequires: rpm-rubyprov
 BuildRequires: ruby-devel
 %endif
 %if %{with tcl}
@@ -302,9 +308,16 @@ Rozszerzenie Tcl-a pozwalające na dostęp do biblioteki Tcl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+%{__sed} -i -e 's#\$TCL_PACKAGE_PATH#%{_prefix}/lib#g' configure.ac
+%{__sed} -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+      examples/stripes.py
 
-sed -i -e 's#\$TCL_PACKAGE_PATH#%{_prefix}/lib#g' configure.ac
-sed -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+tclsh@TCL_VERSION@(\s|$),#!%{__tclsh}\1,' \
+      bindings/tcl/ifOctets.tcl.in
 
 # We only want .txt and .html files for the main documentation
 install -d docs/{html,/txt}
@@ -372,9 +385,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS NEWS THREADS TODO
 %attr(755,root,root) %{_libdir}/librrd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librrd.so.4
-%attr(755,root,root) %{_libdir}/librrd_th.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librrd_th.so.4
+%attr(755,root,root) %ghost %{_libdir}/librrd.so.8
 %{?with_rrdcgi:%attr(755,root,root) %{_bindir}/rrdcgi}
 %attr(755,root,root) %{_bindir}/rrdcreate
 %attr(755,root,root) %{_bindir}/rrdinfo
@@ -384,6 +395,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/cdeftutorial.1*
 %{_mandir}/man1/rpntutorial.1*
 %{_mandir}/man1/rrd-beginners.1*
+%{_mandir}/man1/rrd_pdpcalc.1*
 %{_mandir}/man1/rrdbuild.1*
 %{?with_rrdcgi:%{_mandir}/man1/rrdcgi.1*}
 %{_mandir}/man1/rrdcreate.1*
@@ -394,6 +406,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rrdinfo.1*
 %{_mandir}/man1/rrdlast.1*
 %{_mandir}/man1/rrdlastupdate.1*
+%{_mandir}/man1/rrdlist.1*
 %{?with_ceph:%{_mandir}/man1/rrdrados.1*}
 %{_mandir}/man1/rrdresize.1*
 %{_mandir}/man1/rrdrestore.1*
@@ -413,8 +426,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librrd.so
-%attr(755,root,root) %{_libdir}/librrd_th.so
-%{_libdir}/librrd_th.la
 %{_includedir}/rrd*.h
 %{_pkgconfigdir}/librrd.pc
 %{_mandir}/man3/librrd.3*
@@ -422,7 +433,6 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/librrd.a
-%{_libdir}/librrd_th.a
 
 %files doc
 %defattr(644,root,root,755)
@@ -453,7 +463,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/rrdtool.so
 %if "%{py_ver}" > "2.4"
-%{py_sitedir}/py_rrdtool-*.egg-info
+%{py_sitedir}/rrdtool-*.egg-info
 %endif
 %endif