diff --git a/rrdtool-1.2.27-ssize.diff b/rrdtool-1.2.27-ssize.diff deleted file mode 100644 index f499c6c..0000000 --- a/rrdtool-1.2.27-ssize.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- 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; diff --git a/rrdtool-1.2.27.tar.bz2 b/rrdtool-1.2.27.tar.bz2 deleted file mode 100644 index e3d91fa..0000000 --- a/rrdtool-1.2.27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4e270083a7ac26969bff5304dea6729c10710922e0098ad6cc7a163f76dcbb4 -size 806581 diff --git a/rrdtool-1.3.0.diff b/rrdtool-1.3.0.diff new file mode 100644 index 0000000..74c91d5 --- /dev/null +++ b/rrdtool-1.3.0.diff @@ -0,0 +1,38 @@ +--- configure.ac ++++ configure.ac +@@ -77,8 +77,8 @@ AH_TOP([ + AH_BOTTOM([ + /* make sure that we pickup the correct stuff from all headers */ + #ifdef HAVE_FEATURES_H +-#undef _XOPEN_SOURCE /* keep unmodified */ +-#undef _BSD_SOURCE /* keep unmodified */ ++/* keep unmodified */ #undef _XOPEN_SOURCE ++/* keep unmodified */ #undef _BSD_SOURCE + #define _XOPEN_SOURCE 600 + #define _BSD_SOURCE 1 + # include +@@ -247,14 +247,14 @@ char *strchr (), *strrchr (); + #if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS)) + # define HAVE_ISINF 1 + # ifdef isinf +-# undef isinf /* confuse autoconf */ ++/* confuse autoconf */ # undef isinf + # endif + # define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF) + #endif + + /* solaris 10 it defines isnan such that only forte can compile it ... bad bad */ + #if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS)) +-# undef isnan /* confuse autoconf to NOT remove this */ ++/* confuse autoconf to NOT remove this */ # undef isnan + # define isnan(a) (fpclass(a) == FP_SNAN || fpclass(a) == FP_QNAN) + #endif + +@@ -358,6 +358,7 @@ dnl Check for the compiler and static/sh + AC_PROG_CC + AC_PROG_CPP + AC_PROG_LIBTOOL ++m4_ifdef([LT_OUTPUT],[LT_OUTPUT]) + + dnl Try to detect/use GNU features + CFLAGS="$CFLAGS -D_GNU_SOURCE" diff --git a/rrdtool-1.3.0.tar.bz2 b/rrdtool-1.3.0.tar.bz2 new file mode 100644 index 0000000..fd5650f --- /dev/null +++ b/rrdtool-1.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7f9648d4d26b5f6dbc5f2069a7f5686fb70e1dad2d1683057203c00940fc524 +size 795610 diff --git a/rrdtool.changes b/rrdtool.changes index 6e8a9ea..36d0a27 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 30 17:18:41 CEST 2008 - schwab@suse.de + +- Fix configure script and use of libtool. + +------------------------------------------------------------------- +Fri Jun 27 19:12:17 CEST 2008 - anicka@suse.cz + +- update to 1.3.0 + * Multiplicative Holt-Winters Forecasting + * MMAP IO + * Graphing with Cairo/Pango + * New graphv Interface + * many more changes - major release + ------------------------------------------------------------------- Mon Mar 10 15:03:46 CET 2008 - anicka@suse.cz diff --git a/rrdtool.spec b/rrdtool.spec index df8df4a..b9816cc 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,5 +1,5 @@ # -# spec file for package rrdtool (Version 1.2.27) +# spec file for package rrdtool (Version 1.3.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -8,20 +8,19 @@ # 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 +BuildRequires: cairo-devel freetype2-devel gettext-tools glib2-devel intltool libart_lgpl-devel libpng-devel libxml2-devel pango-devel python-devel tcl-devel License: GPL v2 or later Group: Productivity/Scientific/Math AutoReqProv: on Requires: perl = %{perl_version} -Version: 1.2.27 +Version: 1.3.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 -Patch: %{name}-%{version}-ssize.diff +Patch: %{name}-%{version}.diff Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis @@ -54,11 +53,7 @@ cp libcgi* ../lb/lib cd .. # build rrdtool %{suse_update_config} -libtoolize --force -#autoreconf --force --install -aclocal --force -autoconf -f -automake -fca +autoreconf --force --install CFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ ./configure \ --mandir=%{_mandir} \ @@ -133,9 +128,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/ntmake.pl %{perl_vendorarch}/auto/* /var/adm/perl-modules/rrdtool -%{_datadir}/%{name} +#%{_datadir}/%{name} %package devel +License: GPL v2 or later Summary: A tool for data logging and analysis - Development files Group: Productivity/Scientific/Math Requires: %name = %version @@ -163,6 +159,7 @@ Authors: %{_libdir}/librrd_th.la %package -n python-rrdtool +License: GPL v2 or later Summary: Python bindings for rrdtool Group: Productivity/Scientific/Math Requires: %name = %version @@ -187,6 +184,15 @@ Authors: %{py_sitedir}/* %changelog +* Mon Jun 30 2008 schwab@suse.de +- Fix configure script and use of libtool. +* Fri Jun 27 2008 anicka@suse.cz +- update to 1.3.0 + * Multiplicative Holt-Winters Forecasting + * MMAP IO + * Graphing with Cairo/Pango + * New graphv Interface + * many more changes - major release * Mon Mar 10 2008 anicka@suse.cz - update to 1.2.27 * bindings/ruby/main.c: be more helpful when raising rb_eTypeError @@ -218,7 +224,7 @@ Authors: - build parallel * Mon Jul 09 2007 dmueller@suse.de - apply python requires only to python-rrdtool subpackage -* Thu Jun 21 2007 dmueller@suse.de +* Fri Jun 22 2007 dmueller@suse.de - split off python and -devel package to reduce size and make the python dependency optional (needed for 1 CD installer)