X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=rrdtool.spec;h=dc89c49c9c6943c3e128766ab6cc1664032dd131;hb=9a2e3414a6c57b177fe7a0838b3dbf1b58dbcca9;hp=6f11fea43b954b027caf6eba2f98a9e67648c07e;hpb=9cd8bffa37cde3d0255e761db9ea430da0283f1f;p=packages%2Frrdtool.git

diff --git a/rrdtool.spec b/rrdtool.spec
index 6f11fea..dc89c49 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -1,4 +1,7 @@
 #
+## TODO:
+# - separate package with rrdcached (init script, systemd file, etc)
+#
 # Conditional build:
 %bcond_without	python	# Python binding
 %bcond_without	tcl	# Tcl binding
@@ -12,25 +15,28 @@ 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.4.5
+Version:	1.4.8
 Release:	1
 License:	GPL v2+ + FLOSS exception
 Group:		Applications/Databases
 Source0:	http://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	4d116dba9a0888d8aaac179e35d3980a
+# Source0-md5:	dbe59386db97fd2f2216729facd74ca8
 Patch0:		%{name}-tcl-path.patch
 URL:		http://oss.oetiker.ch/rrdtool/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-BuildRequires:	cairo-devel >= 1.4.6
+BuildRequires:	cairo-devel >= 1.10.2
 BuildRequires:	gettext-devel >= 0.18
-BuildRequires:	glib2-devel >= 1:2.12.12
+BuildRequires:	glib2-devel >= 1:2.28.7
+BuildRequires:	groff
 BuildRequires:	intltool
 BuildRequires:	libdbi-devel
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 2.6.31
+BuildRequires:	libwrap-devel
+BuildRequires:	libxml2-devel >= 1:2.7.8
+BuildRequires:	lua51 >= 5.1
 BuildRequires:	lua51-devel >= 5.1
-BuildRequires:	pango-devel >= 1:1.17
+BuildRequires:	pango-devel >= 1:1.28.4
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	pkgconfig
 %if %{with python}
@@ -42,10 +48,10 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.272
 %{?with_ruby:BuildRequires:	ruby-devel}
 %{?with_tcl:BuildRequires:	tcl-devel}
-Requires:	cairo >= 1.4.6
-Requires:	glib2 >= 1:2.12.12
-Requires:	libxml2 >= 2.6.31
-Requires:	pango >= 1:1.17
+Requires:	cairo >= 1.10.2
+Requires:	glib2 >= 1:2.28.7
+Requires:	libxml2 >= 1:2.7.8
+Requires:	pango >= 1:1.28.4
 Suggests:	fonts-TTF-DejaVu
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -106,11 +112,12 @@ Summary(ru.UTF-8):	RRDtool - Заголовки, необходимые для 
 Summary(uk.UTF-8):	RRDtool - бібліотечні лінки та файли хедерів
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	cairo-devel >= 1.4.6
-Requires:	glib2-devel >= 1:2.12.12
+Requires:	cairo-devel >= 1.10.2
+Requires:	glib2-devel >= 1:2.28.7
 Requires:	libdbi-devel
-Requires:	libxml2-devel >= 2.6.31
-Requires:	pango-devel >= 1:1.17
+Requires:	libwrap-devel
+Requires:	libxml2-devel >= 1:2.7.8
+Requires:	pango-devel >= 1:1.28.4
 
 %description devel
 RRDtool development files.
@@ -275,7 +282,11 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 	RUBYARCHDIR=$RPM_BUILD_ROOT%{ruby_archdir}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lua/5.1/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RRDs/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RRDs/.packlist
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librrd.la
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -300,7 +311,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librrd.so
 %attr(755,root,root) %{_libdir}/librrd_th.so
-%{_libdir}/librrd.la
 %{_libdir}/librrd_th.la
 %{_includedir}/rrd*.h
 %{_pkgconfigdir}/librrd.pc