[packages/rrdtool] add rrd_graph bcond

glen glen at pld-linux.org
Mon Jun 8 19:00:30 CEST 2015


commit 235819b32d25c436528f2802a3bc52bfc7ea3fb5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 8 11:41:34 2015 +0300

    add rrd_graph bcond

 rrdtool.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/rrdtool.spec b/rrdtool.spec
index 86005e7..2a5fb7d 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -8,6 +8,7 @@
 %bcond_without	python	# Python binding
 %bcond_without	ruby	# Ruby binding
 %bcond_without	tcl	# Tcl binding
+%bcond_without	rrd_graph	# disable all rrd_graph functions
 
 %define	pdir	RRDp
 %include	/usr/lib/rpm/macros.perl
@@ -27,7 +28,6 @@ Patch0:		%{name}-tcl-path.patch
 URL:		http://oss.oetiker.ch/rrdtool/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-BuildRequires:	cairo-devel >= 1.10.2
 BuildRequires:	gettext-tools >= 0.18
 BuildRequires:	glib2-devel >= 1:2.28.7
 BuildRequires:	groff
@@ -36,10 +36,13 @@ BuildRequires:	libdbi-devel
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
 BuildRequires:	libxml2-devel >= 1:2.7.8
-BuildRequires:	pango-devel >= 1:1.28.7
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.272
+%if %{with rrd_graph}
+BuildRequires:	cairo-devel >= 1.10.2
+BuildRequires:	pango-devel >= 1:1.28.7
+%endif
 %if %{with lua}
 BuildRequires:	lua51 >= 5.1
 BuildRequires:	lua51-devel >= 5.1
@@ -58,10 +61,10 @@ BuildRequires:	ruby-devel
 %if %{with tcl}
 BuildRequires:	tcl-devel}
 %endif
-Requires:	cairo >= 1.10.2
+%{?with_rrd_graph:Requires:	cairo >= 1.10.2}
 Requires:	glib2 >= 1:2.28.7
 Requires:	libxml2 >= 1:2.7.8
-Requires:	pango >= 1:1.28.7
+%{?with_rrd_graph:Requires:	pango >= 1:1.28.7}
 Suggests:	fonts-TTF-DejaVu
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -122,12 +125,12 @@ Summary(ru.UTF-8):	RRDtool - Заголовки, необходимые для 
 Summary(uk.UTF-8):	RRDtool - бібліотечні лінки та файли хедерів
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	cairo-devel >= 1.10.2
+%{?with_rrd_graph:Requires:	cairo-devel >= 1.10.2}
 Requires:	glib2-devel >= 1:2.28.7
 Requires:	libdbi-devel
 Requires:	libwrap-devel
 Requires:	libxml2-devel >= 1:2.7.8
-Requires:	pango-devel >= 1:1.28.7
+%{?with_rrd_graph:Requires:	pango-devel >= 1:1.28.7}
 
 %description devel
 RRDtool development files.
@@ -269,6 +272,7 @@ sed -i -e 's#/lib/lua/#/%{_lib}/lua/#g' configure.ac
 %configure \
 	LUA=/usr/bin/lua5.1 \
 	--disable-silent-rules \
+	%{!?with_rrd_graph:--disable-rrd_graph} \
 	%{!?with_lua:--disable-lua} \
 	%{!?with_python:--disable-python} \
 	%{!?with_ruby:--disable-ruby} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rrdtool.git/commitdiff/c7f7d8c5fba1a84ea023d3e523369e7fc767fbf2



More information about the pld-cvs-commit mailing list