X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rrdtool.spec;h=1860d6d5ddc047643c128ba8cf7fa20b4d4fae41;hb=c23115298f865e187bd912dbe2a162f4ce705668;hp=b8123607b5b3b12011927a4a39a4f85b591baaae;hpb=b68b5d775b4117f025d35f57b7b36a132a7327f0;p=packages%2Frrdtool.git

diff --git a/rrdtool.spec b/rrdtool.spec
index b812360..1860d6d 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -7,7 +7,7 @@
 %bcond_without	python		# Python binding
 %bcond_without	ruby		# Ruby binding
 %bcond_without	tcl		# Tcl binding
-%bcond_without	ceph		# Ceph (RADOS) storage support
+%bcond_with	ceph		# Ceph (RADOS) storage support
 %bcond_without	rrd_graph	# all rrd_graph functions (depend on cairo+pango)
 %bcond_without	rrdcgi		# building of rrdcgi (depends on rrd_graph)
 
@@ -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.7.0
+Version:	1.7.2
 Release:	3
 License:	GPL v2+ + FLOSS exception
 Group:		Applications/Databases
 Source0:	https://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	2f37eeb613bed11077470c9e2057010e
+# 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}
@@ -382,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*