Changes - j0ke.net Open Build Service

Changes of Revision 7

[-] [+]	Added	rrdtool.spec
@@ -0,0 +1,363 @@ +# +# spec file for package rrdtool (Version 1.2.30) +# +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: rrdtool +BuildRequires: freetype2-devel libart_lgpl-devel libpng-devel python-devel tcl-devel +License: GPL v2 or later +Group: Productivity/Scientific/Math +AutoReqProv: on +Requires: perl = %{perl_version} +Version: 1.2.30 +Release: 75 +Source: %{name}-%{version}.tar.bz2 +Source1: cgilib-0.5.tar.bz2 +Patch: %{name}-%{version}-ssize.diff +Url: http://oss.oetiker.ch/rrdtool/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: A tool for data logging and analysis +Requires: dejavu >= 2.21 + +%description +A tool to log and analyze data gathered from all kinds of data sources. +The data analysis part of RRDtool is based on the ability to quickly +generate graphical representations of the data values collected over a +definable time period. + + + +Authors: +-------- + Tobias Oetiker <oetiker@ee.ethz.ch> + +%prep +%setup -q -a1 +%patch + +%build +# first prepare cgilib +cd cgilib* +make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I." +mkdir -p ../lb/include +cp .h ../lb/include +mkdir -p ../lb/lib +cp libcgi ../lb/lib +cd .. +# build rrdtool +%{suse_update_config} +libtoolize --force +#autoreconf --force --install +aclocal --force +autoconf -f +automake -fca +CFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ +./configure \ + --mandir=%{_mandir} \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --datadir=%{_datadir} \ + --infodir=%{_infodir} \ + --sysconfdir=%{_sysconfdir} \ + --enable-shared \ + --with-tcllib=%{_libdir} \ + --with-gnu-ld \ + --with-rrd-default-font=/usr/share/fonts/truetype/DejaVuSansMono.ttf +make %{?jobs:-j %jobs} + +%install +#eval `perl -V:installarchlib` +make \ + DESTDIR=$RPM_BUILD_ROOT \ + idocdir=%{_docdir}/%{name}/txt/ \ + ihtmldir=%{_docdir}/%{name}/html/ \ + examplesdir=%{_docdir}/%{name}/examples/ \ + libdir=%{_libdir} \ + pkglibdir=%_datadir/tcl/tclrrd%version \ + TCL_PACKAGE_DIR=%_datadir/tcl/tclrrd%version \ + TCL_PACKAGE_PATH=%_datadir/tcl \ + install +# we install this later again +rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl +# do not install fonts (use system fonts instead) +rm -rf $RPM_BUILD_ROOT%_datadir/rrdtool/fonts +# install correctly perl modules +pushd bindings/perl-piped +perl Makefile.PL +make DESTDIR=$RPM_BUILD_ROOT install_vendor +popd +pushd bindings/perl-shared +perl Makefile.PL +make DESTDIR=$RPM_BUILD_ROOT install_vendor +popd +%perl_process_packlist +#fix build (it would be better to split cgilib) +sed 's/[[:space:]]-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]/ /' $RPM_BUILD_ROOT/%{_libdir}/librrd.la > tmp +mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd.la +sed 's/[[:space:]]-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]/ /' $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la > tmp +mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la +# documentation +install -m 644 CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO $RPM_BUILD_ROOT/%{_docdir}/%{name} +# Script libraries for Tcl extensions should be in a package-specific +# subdir of /usr/share/tcl +mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version} +#mv $RPM_BUILD_ROOT/usr/lib/tclrrd%{version}/pkgIndex.tcl \ +# $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc %{_docdir}/rrdtool +%doc %{_mandir}// +/usr/bin/* +%{_datadir}/tcl +%{_libdir}/librrd.so.* +%{_libdir}/librrd_th.so.* +%{_libdir}/tclrrd.so +%{perl_vendorlib}/RRDp.pm +%{perl_vendorarch}/RRDs.pm +%{perl_vendorarch}/ntmake.pl +%{perl_vendorarch}/auto/ +/var/adm/perl-modules/rrdtool +%{_datadir}/%{name} + +%package devel +Summary: A tool for data logging and analysis - Development files +Group: Productivity/Scientific/Math +Requires: %name = %version + +%description devel +A tool to log and analyze data gathered from all kinds of data sources. +The data analysis part of RRDtool is based on the ability to quickly +generate graphical representations of the data values collected over a +definable time period. + + + +Authors: +-------- + Tobias Oetiker <oetiker@ee.ethz.ch> + +%files devel +%defattr(-, root, root) +/usr/include/* +%{_libdir}/librrd_th.so +%{_libdir}/librrd.a +%{_libdir}/librrd.la +%{_libdir}/librrd.so +%{_libdir}/librrd_th.a +%{_libdir}/librrd_th.la + +%package -n python-rrdtool +Summary: Python bindings for rrdtool +Group: Productivity/Scientific/Math +Requires: %name = %version +%py_requires + +%description -n python-rrdtool +A tool to log and analyze data gathered from all kinds of data sources. +The data analysis part of RRDtool is based on the ability to quickly +generate graphical representations of the data values collected over a +definable time period. + +This package contains the Python bindings + + + +Authors: +-------- + Tobias Oetiker <oetiker@ee.ethz.ch> + +%files -n python-rrdtool +%defattr(-, root, root) +%{py_sitedir}/* + +%changelog +* Tue Jan 20 2009 Carsten Schoene <cs@linux-administrator.com> +- update to version 1.2.30 + * TICK with negative numbers should 'start from the top of the graph' looking down ... now it does. + * fix for segfault in rrd_cgi: caused by freeing a invalid address when printing an error message. + + +* Thu Jul 24 2008 Carsten Schoene <cs@linux-administrator.com> +- update to version 1.2.28 + * build fixes + * add filename to illegal update message + * rrdtool.fetch is returning an extra, bogus, data point.
[-] [+]	Added	rrdtool-1.2.23-python.diff ^
@@ -0,0 +1,11 @@ +--- bindings/python/setup.py ++++ bindings/python/setup.py +@@ -48,7 +48,7 @@ + "rrdtoolmodule", + ["rrdtoolmodule.c"], + libraries=['rrd'], +- runtime_library_dirs=[library_dir], ++# runtime_library_dirs=[library_dir], + library_dirs=[library_dir], + include_dirs=[include_dir], + )
[-] [+]	Added	rrdtool-1.2.23-ssize.diff ^
@@ -0,0 +1,16 @@ +--- bindings/python/rrdtoolmodule.c ++++ bindings/python/rrdtoolmodule.c +@@ -57,7 +57,12 @@ + PyObject o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } + argv = PyMem_New(char , size + 1); + if (argv == NULL) + return -1;
[-] [+]	Added	rrdtool-1.2.26-ssize.diff ^
@@ -0,0 +1,16 @@ +--- bindings/python/rrdtoolmodule.c ++++ bindings/python/rrdtoolmodule.c +@@ -57,7 +57,12 @@ + PyObject o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } + argv = PyMem_New(char , size + 1); + if (argv == NULL) + return -1;
[-] [+]	Added	rrdtool-1.2.27-ssize.diff ^
@@ -0,0 +1,16 @@ +--- bindings/python/rrdtoolmodule.c ++++ bindings/python/rrdtoolmodule.c +@@ -57,7 +57,12 @@ + PyObject o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } + argv = PyMem_New(char , size + 1); + if (argv == NULL) + return -1;
[-] [+]	Added	rrdtool-1.2.28-ssize.diff ^
@@ -0,0 +1,16 @@ +--- bindings/python/rrdtoolmodule.c ++++ bindings/python/rrdtoolmodule.c +@@ -57,7 +57,12 @@ + PyObject o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } + argv = PyMem_New(char , size + 1); + if (argv == NULL) + return -1;
[-] [+]	Added	rrdtool-1.2.30-ssize.diff ^
@@ -0,0 +1,16 @@ +--- bindings/python/rrdtoolmodule.c ++++ bindings/python/rrdtoolmodule.c +@@ -57,7 +57,12 @@ + PyObject o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } + argv = PyMem_New(char , size + 1); + if (argv == NULL) + return -1;
[-] [+]	Added	rrdtool-1.3.0-ssize.diff ^
@@ -0,0 +1,17 @@ +--- bindings/python/rrdtoolmodule.c.orig 2008-06-11 20:14:04.000000000 +0200 ++++ bindings/python/rrdtoolmodule.c 2008-06-11 20:15:07.000000000 +0200 +@@ -61,7 +61,13 @@ + PyObject o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } ++ + argv = PyMem_New(char *, + size + 1); +
	Added	cgilib-0.5.tar.bz2 ^
	Added	ready ^
	Added	rrdtool-1.2.23.tar.bz2 ^
	Added	rrdtool-1.2.26.tar.gz ^
	Added	rrdtool-1.2.28.tar.gz ^
	Added	rrdtool-1.2.30.tar.bz2 ^
	Added	rrdtool-1.3.0.tar.gz ^