diff --git a/cgilib-0.5.tar.bz2 b/cgilib-0.5.tar.bz2 deleted file mode 100644 index 84ea577..0000000 --- a/cgilib-0.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27fd66753def91314339070387b2b22977b1a054855108d2b59d7d74d9bee947 -size 13039 diff --git a/cgilib-0.7.tar.bz2 b/cgilib-0.7.tar.bz2 new file mode 100644 index 0000000..5c75df0 --- /dev/null +++ b/cgilib-0.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13806e1a816934b32c5995ee8300c807eb62aefd4574006e1d65b6afe34bc425 +size 206003 diff --git a/cgilib-fix_automake.patch b/cgilib-fix_automake.patch new file mode 100644 index 0000000..93455b5 --- /dev/null +++ b/cgilib-fix_automake.patch @@ -0,0 +1,18 @@ +--- configure.ac.orig 2010-12-28 03:10:53.000000000 +0100 ++++ configure.ac 2010-12-28 03:15:03.000000000 +0100 +@@ -1,11 +1,11 @@ +-AC_INIT(cgi.c) +- +-AM_INIT_AUTOMAKE(cgilib, 0.7) ++AC_INIT(cgilib, 0.7) ++AC_CONFIG_SRCDIR([cgi.c]) ++AM_INIT_AUTOMAKE + SO_VERSION=1:0:0 + + AC_PROG_CC + AC_PROG_INSTALL +-AC_PROG_LIBTOOL ++AM_PROG_LIBTOOL + + AC_SUBST(SO_VERSION) + diff --git a/rrdtool-1.4.4.tar.bz2 b/rrdtool-1.4.4.tar.bz2 deleted file mode 100644 index 8152d7d..0000000 --- a/rrdtool-1.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c73af303eefa96eee3eca02c263d420b03a34032517a23d181d3a5463e9f415b -size 988841 diff --git a/rrdtool-1.4.5.tar.bz2 b/rrdtool-1.4.5.tar.bz2 new file mode 100644 index 0000000..8685876 --- /dev/null +++ b/rrdtool-1.4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc359be3b68f19db0abce99cd30b7ae9fc81a75f150468304f7c284dff5929ba +size 993765 diff --git a/rrdtool-lua_lib64.patch b/rrdtool-lua_lib64.patch new file mode 100644 index 0000000..3cb1616 --- /dev/null +++ b/rrdtool-lua_lib64.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2010-12-28 03:34:15.000000000 +0100 ++++ configure.ac 2010-12-28 03:34:27.000000000 +0100 +@@ -783,7 +783,7 @@ + done + fi + +- LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot" ++ LUA_RRD_LIBDIR="$langpref/lib64/lua/$lua_vdot" + # if lua 5.0 can't find compat-5.1, force installation of + # compat-5.1.lua together with RRDtool. + if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then diff --git a/rrdtool.changes b/rrdtool.changes index b25df8b..972e1fd 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Dec 28 02:05:03 UTC 2010 - pascal.bleser@opensuse.org + +- build lua bindings (new subpackage lua-rrdtool) + +- update to 1.4.5: + * rrdcached: print \n at the end of log messages when running rrdcached in the foreground + * rrdcached: Let the -s, -m and -P options affect the default socket as well + * rrdgraph: font related memory leaks fixed #208 + * rrdgraph-libdbi: print error message instead of dumping core on sql problem + * rrdgraph-libdbi: properly allocated response buffer + * rrdtool: in remote mode, make argument count for remote commmands strict + * rrdgraph: fix problems with second %s in right-axis format + * everywhere: fix locale handling. locales were not properly reset after calling set locale + * rrdgraph: fix use of %s in strftime (G)PRINT commands #277 + * ruby: fix bindings to be compatible with curent ruby implementations #279 + * rrdcached: Ensure that response_read() always calls fflush() or fclose() #278 + * rrd_client: free addrinfo list after use ... + * rrdupdate: follow the normal code path for exiting rrd_update if there is a problem with rrdc, plugging a memory leak on the way + * rrdgraph: make sure we do not try to draw points all that far outside the drawing area since some versions of cairo seem to go unstable when this happens + * rrdgraph: fix an endles loop near 2^31 timestamp (32bit platform problem) + * rrdcached: fix permissions of the default socket + * rrdgraph-libdbi: Fix sigma calculation + * rrdcreate: better checks for RRA arguments + * rrdgraph: if there is no right label, do not reserve any space for it + * Enhancements: + + rrdcached: add hosts_access support + + rrdfetch/graph: introduce "epoch" as a new base time reference, meaning timestamp 0: you can now write epoch+11111111s or epoch+19711205s + * update in-tree cgilib to 0.7: + + allow cookies without regular CGI POST/GET variables + + support for ';' as delimiter + + support for multipart/form-data + + support for file upload + + decode variable names and data + ------------------------------------------------------------------- Tue Dec 7 05:50:32 UTC 2010 - coolo@novell.com diff --git a/rrdtool.spec b/rrdtool.spec index 86da331..8cff690 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,5 +1,5 @@ # -# spec file for package rrdtool (Version 1.4.4) +# spec file for package rrdtool (Version 1.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,14 +20,21 @@ Name: rrdtool BuildRequires: cairo-devel freetype2-devel gettext-tools glib2-devel intltool libart_lgpl-devel libpng-devel libxml2-devel pango-devel python-devel tcl-devel BuildRequires: ruby-devel +BuildRequires: lua-devel +BuildRequires: autoconf automake libtool +BuildRequires: tcpd-devel License: GPLv2+ Group: Productivity/Scientific/Math -AutoReqProv: on Requires: perl = %{perl_version} -Version: 1.4.4 -Release: 2 +Version: 1.4.5 +%define cgilib_version 0.7 +Release: 1 +# http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz Source: %{name}-%{version}.tar.bz2 -Source1: cgilib-0.5.tar.bz2 +Patch1: rrdtool-lua_lib64.patch +# http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz +Source1: cgilib-%{cgilib_version}.tar.bz2 +Patch11: cgilib-fix_automake.patch Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis @@ -41,27 +48,45 @@ definable time period. %prep %setup -q -a1 +%if %{_lib}==lib64 +%patch1 +%endif +pushd "cgilib-%{cgilib_version}" +%patch11 +popd #cgilib %build # first prepare cgilib -cd cgilib* -make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -fexcess-precision=fast" -mkdir -p ../lb/include -cp *.h ../lb/include -mkdir -p ../lb/lib -cp libcgi* ../lb/lib -cd .. +pushd cgilib-%{cgilib_version} +echo -n > NEWS +aclocal --force +autoreconf -fiv +CFLAGS="%{optflags} -fPIC -I. -fexcess-precision=fast" \ +%configure +make %{?jobs:-j %jobs} +%__mkdir_p ../lb/include +%__cp *.h ../lb/include/ +%__mkdir_p ../lb/lib/ +%__cp -a .libs/libcgi.so* ../lb/lib/ +popd #cgilib + # build rrdtool %{suse_update_config} if [ ! -d m4 ]; then mkdir m4; fi # we need getext 0.18 #autoreconf -i -f +%if %{_lib}==lib64 +# don't pass -i to autoreconf, that'll run autopoint which will go +# nuts because of the supposedly outdated gettext version: +autoreconf -fv +%endif export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ %configure --disable-static --with-pic --enable-shared \ --with-tcllib=%{_libdir} \ --with-gnu-ld \ + --disable-rpath \ --with-rrd-default-font="monospace" -make %{?jobs:-j %jobs} +make %{?jobs:-j %jobs} V=1 %install #eval `perl -V:installarchlib` @@ -94,7 +119,7 @@ popd #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 -rm $RPM_BUILD_ROOT/%{_libdir}/*.la +find "%{buildroot}" -type f -name '*.la' -exec %__rm {} \; # 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 @@ -167,4 +192,23 @@ This package contains the Python bindings %defattr(-, root, root) %{py_sitedir}/* +%package -n lua-rrdtool +License: GPLv2+ +Summary: Lua bindings for rrdtool +Group: Productivity/Scientific/Math +Requires: %name = %version + +%description -n lua-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 Lua bindings + +%files -n lua-rrdtool +%defattr(-, root, root) +%{_libdir}/lua/*/rrd.so +%{_libdir}/lua/*/rrd.so.* + %changelog