OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 16-Dec-2008 08:43:03 Branch: HEAD Handle: 2008121607430300 Modified files: openpkg-src/rrdtool rrdtool.patch rrdtool.spec Log: upgrading package: rrdtool 1.3.4 -> 1.3.5 Summary: Revision Changes Path 1.27 +28 -22 openpkg-src/rrdtool/rrdtool.patch 1.118 +2 -2 openpkg-src/rrdtool/rrdtool.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/rrdtool/rrdtool.patch ============================================================================ $ cvs diff -u -r1.26 -r1.27 rrdtool.patch --- openpkg-src/rrdtool/rrdtool.patch 5 Oct 2008 07:48:44 -0000 1.26 +++ openpkg-src/rrdtool/rrdtool.patch 16 Dec 2008 07:43:03 -0000 1.27 @@ -1,6 +1,6 @@ Index: RRDTool-OO-0.22/Makefile.PL --- RRDTool-OO-0.22/Makefile.PL.orig 2008-01-24 04:29:54 +0100 -+++ RRDTool-OO-0.22/Makefile.PL 2008-10-05 09:39:11 +0200 ++++ RRDTool-OO-0.22/Makefile.PL 2008-12-16 08:35:38 +0100 @@ -2,55 +2,12 @@ use ExtUtils::MakeMaker; use File::Basename; @@ -59,7 +59,7 @@ ($] >= 5.005 ? ## Add these new keywords supported since 5.005 Index: RRDTool-OO-0.22/lib/RRDTool/OO.pm --- RRDTool-OO-0.22/lib/RRDTool/OO.pm.orig 2008-05-20 11:17:57 +0200 -+++ RRDTool-OO-0.22/lib/RRDTool/OO.pm 2008-10-05 09:39:11 +0200 ++++ RRDTool-OO-0.22/lib/RRDTool/OO.pm 2008-12-16 08:35:38 +0100 @@ -5,7 +5,6 @@ use warnings; use Carp; @@ -87,9 +87,9 @@ } } Index: bindings/perl-shared/Makefile.PL ---- bindings/perl-shared/Makefile.PL.orig 2008-09-19 22:34:42 +0200 -+++ bindings/perl-shared/Makefile.PL 2008-10-05 09:40:49 +0200 -@@ -1,30 +1,7 @@ +--- bindings/perl-shared/Makefile.PL.orig 2008-12-05 16:39:55 +0100 ++++ bindings/perl-shared/Makefile.PL 2008-12-16 08:37:40 +0100 +@@ -1,36 +1,7 @@ use ExtUtils::MakeMaker; use Config; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence @@ -116,14 +116,20 @@ -# library after it is installed. This install_name gets transfered -# to the perl shared object. - --my $librrd = "-L../../src/.libs/ $R -lrrd"; +-my $librrd; +-if ($^O eq 'darwin'){ +- $librrd = '-lrrd'; +-} +-else { +- $librrd = "-L../../src/.libs/ $R -lrrd"; +-} +my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype -lpng -lz -lart_lgpl"; WriteMakefile( 'NAME' => 'RRDs', Index: bindings/python/setup.py --- bindings/python/setup.py.orig 2008-03-15 11:39:48 +0100 -+++ bindings/python/setup.py 2008-10-05 09:39:11 +0200 ++++ bindings/python/setup.py 2008-12-16 08:35:38 +0100 @@ -47,7 +47,7 @@ Extension( "rrdtoolmodule", @@ -134,9 +140,9 @@ include_dirs=[include_dir], ) Index: configure ---- configure.orig 2008-10-04 18:04:20 +0200 -+++ configure 2008-10-05 09:39:11 +0200 -@@ -30688,7 +30688,7 @@ +--- configure.orig 2008-12-15 23:06:39 +0100 ++++ configure 2008-12-16 08:35:38 +0100 +@@ -30827,7 +30827,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -145,7 +151,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30871,7 +30871,7 @@ +@@ -31010,7 +31010,7 @@ fi if test $ac_cv_header_pango_pango_h = yes; then @@ -154,7 +160,7 @@ fi -@@ -30927,14 +30927,14 @@ +@@ -31066,14 +31066,14 @@ LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-L pangocairo` LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-other pangocairo` LIBS=${LIBS}" "`$PKGCONFIG --libs-only-l pangocairo` @@ -171,7 +177,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32412,9 +32412,9 @@ +@@ -32551,9 +32551,9 @@ echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` @@ -184,9 +190,9 @@ save_CPPFLAGS="$CPPFLAGS" Index: src/rrd_open.c ---- src/rrd_open.c.orig 2008-10-04 18:04:04 +0200 -+++ src/rrd_open.c 2008-10-05 09:41:48 +0200 -@@ -188,7 +188,7 @@ +--- src/rrd_open.c.orig 2008-12-15 23:06:22 +0100 ++++ src/rrd_open.c 2008-12-16 08:35:38 +0100 +@@ -218,7 +218,7 @@ #endif if (rdwr & RRD_CREAT) goto out_done; @@ -195,7 +201,7 @@ if (rdwr & RRD_COPY) { /* We will read everything in a moment (copying) */ madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL); -@@ -221,7 +221,7 @@ +@@ -251,7 +251,7 @@ rrd->stat_head->version); goto out_nullify_head; } @@ -204,7 +210,7 @@ /* the ds_def will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(ds_def_t) * rrd->stat_head->ds_cnt, MADV_WILLNEED); -@@ -229,7 +229,7 @@ +@@ -259,7 +259,7 @@ __rrd_read(rrd->ds_def, ds_def_t, rrd->stat_head->ds_cnt); @@ -213,7 +219,7 @@ /* the rra_def will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(rra_def_t) * rrd->stat_head->rra_cnt, MADV_WILLNEED); -@@ -244,7 +244,7 @@ +@@ -274,7 +274,7 @@ rrd_set_error("live_head_t malloc"); goto out_close; } @@ -222,7 +228,7 @@ /* the live_head will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED); #endif -@@ -254,7 +254,7 @@ +@@ -284,7 +284,7 @@ rrd->live_head->last_up = *rrd->legacy_last_up; rrd->live_head->last_up_usec = 0; } else { @@ -231,7 +237,7 @@ /* the live_head will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(live_head_t), MADV_WILLNEED); -@@ -377,7 +377,7 @@ +@@ -414,7 +414,7 @@ + rrd->rra_ptr[i].cur_row * rrd->stat_head->ds_cnt * sizeof(rrd_value_t)); if (active_block > dontneed_start) { @@ -240,7 +246,7 @@ madvise(rrd_file->file_start + dontneed_start, active_block - dontneed_start - 1, MADV_DONTNEED); #endif -@@ -402,7 +402,7 @@ +@@ -439,7 +439,7 @@ } if (dontneed_start < rrd_file->file_len) { @@ . patch -p0 <<'@@ .' Index: openpkg-src/rrdtool/rrdtool.spec ============================================================================ $ cvs diff -u -r1.117 -r1.118 rrdtool.spec --- openpkg-src/rrdtool/rrdtool.spec 5 Oct 2008 07:48:44 -0000 1.117 +++ openpkg-src/rrdtool/rrdtool.spec 16 Dec 2008 07:43:03 -0000 1.118 @@ -22,7 +22,7 @@ ## # package version -%define V_rrdtool 1.3.4 +%define V_rrdtool 1.3.5 %define V_rrdtool_oo 0.22 %define V_rrdtool_creator 0.9 %define V_rrd_simple 1.44 @@ -38,7 +38,7 @@ Group: Database License: LGPL Version: %{V_rrdtool} -Release: 20081005 +Release: 20081216 # package options %option with_perl no @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
