OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 19-May-2009 19:22:38
Branch: HEAD Handle: 2009051918223700
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
upgrading package: rrdtool 1.3.7 -> 1.3.8
Summary:
Revision Changes Path
1.31 +28 -36 openpkg-src/rrdtool/rrdtool.patch
1.125 +2 -2 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.30 -r1.31 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 30 Apr 2009 21:41:24 -0000 1.30
+++ openpkg-src/rrdtool/rrdtool.patch 19 May 2009 17:22:37 -0000 1.31
@@ -1,6 +1,6 @@
Index: RRDTool-OO-0.25/Makefile.PL
---- RRDTool-OO-0.25/Makefile.PL.orig 2008-01-24 04:29:54 +0100
-+++ RRDTool-OO-0.25/Makefile.PL 2008-12-16 08:35:38 +0100
+--- RRDTool-OO-0.25/Makefile.PL.orig 2009-04-26 00:51:10 +0200
++++ RRDTool-OO-0.25/Makefile.PL 2009-05-19 19:08:24 +0200
@@ -2,55 +2,12 @@
use ExtUtils::MakeMaker;
use File::Basename;
@@ -58,17 +58,17 @@
}, # e.g., Module::Name => 1.1
($] >= 5.005 ? ## Add these new keywords supported since 5.005
Index: RRDTool-OO-0.25/lib/RRDTool/OO.pm
---- RRDTool-OO-0.25/lib/RRDTool/OO.pm.orig 2008-05-20 11:17:57 +0200
-+++ RRDTool-OO-0.25/lib/RRDTool/OO.pm 2008-12-16 08:35:38 +0100
+--- RRDTool-OO-0.25/lib/RRDTool/OO.pm.orig 2009-04-29 16:42:32 +0200
++++ RRDTool-OO-0.25/lib/RRDTool/OO.pm 2009-05-19 19:08:24 +0200
@@ -5,7 +5,6 @@
use warnings;
use Carp;
use RRDs;
-use Log::Log4perl qw(:easy);
- our $VERSION = '0.22';
+ our $VERSION = '0.25';
-@@ -183,7 +182,7 @@
+@@ -187,7 +186,7 @@
# Check if we got all mandatory parameters
for(@{$ref->{mandatory}}) {
if(! exists $options_hash{$_}) {
@@ -77,7 +77,7 @@
"Mandatory parameter '$_' not set " .
"in $method() (@{[%mandatory]}) (@$options)");
}
-@@ -195,7 +194,7 @@
+@@ -199,7 +198,7 @@
for(keys %options_hash) {
if(! exists $optional{$_} and
! exists $mandatory{$_}) {
@@ -88,7 +88,7 @@
}
Index: bindings/perl-shared/Makefile.PL
--- 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
++++ bindings/perl-shared/Makefile.PL 2009-05-19 19:08:24 +0200
@@ -1,36 +1,7 @@
use ExtUtils::MakeMaker;
use Config;
@@ -129,7 +129,7 @@
'NAME' => 'RRDs',
Index: bindings/python/setup.py
--- bindings/python/setup.py.orig 2008-03-15 11:39:48 +0100
-+++ bindings/python/setup.py 2008-12-16 08:35:38 +0100
++++ bindings/python/setup.py 2009-05-19 19:08:24 +0200
@@ -47,7 +47,7 @@
Extension(
"rrdtoolmodule",
@@ -140,10 +140,10 @@
include_dirs=[include_dir],
)
Index: configure
---- 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
+--- configure.orig 2009-05-19 15:45:23 +0200
++++ configure 2009-05-19 19:13:50 +0200
+@@ -23293,7 +23293,7 @@
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpango-1.0 $LIBS"
@@ -151,25 +151,17 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31010,7 +31010,7 @@
+@@ -23482,7 +23482,7 @@
fi
- if test $ac_cv_header_pango_pango_h = yes; then
+ if test "x$ac_cv_header_pango_pango_h" = x""yes; then
- LIBS="-lpango-1.0 ${LIBS}";EX_CHECK_STATE=YES
+ LIBS="-lpango ${LIBS}";EX_CHECK_STATE=YES
fi
-@@ -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`
-- unset ac_cv_lib_`echo pango-1.0 | sed
's/[^_a-zA-Z0-9]/_/g;s/^[0-9]/_/'`_pango_cairo_context_set_font_options
-+ unset ac_cv_lib_`echo pango | sed
's/[^_a-zA-Z0-9]/_/g;s/^[0-9]/_/'`_pango_cairo_context_set_font_options
- { echo "$as_me:$LINENO: checking for
pango_cairo_context_set_font_options in -lpango-1.0" >&5
- echo $ECHO_N "checking for pango_cairo_context_set_font_options in
-lpango-1.0... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pango_1_0_pango_cairo_context_set_font_options+set}" =
set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -23545,7 +23545,7 @@
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpango-1.0 $LIBS"
@@ -177,8 +169,8 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32551,9 +32551,9 @@
- echo $ECHO_N "checking for headers required to compile python extensions...
$ECHO_C" >&6; }
+@@ -25049,9 +25049,9 @@
+ $as_echo_n "checking for headers required to compile python extensions... "
>&6; }
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
@@ -190,9 +182,9 @@
save_CPPFLAGS="$CPPFLAGS"
Index: src/rrd_open.c
---- 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 @@
+--- src/rrd_open.c.orig 2009-05-19 15:45:05 +0200
++++ src/rrd_open.c 2009-05-19 19:08:24 +0200
+@@ -219,7 +219,7 @@
#endif
if (rdwr & RRD_CREAT)
goto out_done;
@@ -201,7 +193,7 @@
if (rdwr & RRD_COPY) {
/* We will read everything in a moment (copying) */
madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL);
-@@ -251,7 +251,7 @@
+@@ -252,7 +252,7 @@
rrd->stat_head->version);
goto out_nullify_head;
}
@@ -210,7 +202,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);
-@@ -259,7 +259,7 @@
+@@ -260,7 +260,7 @@
__rrd_read(rrd->ds_def, ds_def_t,
rrd->stat_head->ds_cnt);
@@ -219,7 +211,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);
-@@ -274,7 +274,7 @@
+@@ -275,7 +275,7 @@
rrd_set_error("live_head_t malloc");
goto out_close;
}
@@ -228,7 +220,7 @@
/* the live_head will be needed soonish, so hint accordingly */
madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
#endif
-@@ -284,7 +284,7 @@
+@@ -285,7 +285,7 @@
rrd->live_head->last_up = *rrd->legacy_last_up;
rrd->live_head->last_up_usec = 0;
} else {
@@ -237,7 +229,7 @@
/* the live_head will be needed soonish, so hint accordingly */
madvise(data + PAGE_START(offset),
sizeof(live_head_t), MADV_WILLNEED);
-@@ -414,7 +414,7 @@
+@@ -415,7 +415,7 @@
+ rrd->rra_ptr[i].cur_row
* rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
if (active_block > dontneed_start) {
@@ -246,7 +238,7 @@
madvise(rrd_file->file_start + dontneed_start,
active_block - dontneed_start - 1, MADV_DONTNEED);
#endif
-@@ -439,7 +439,7 @@
+@@ -440,7 +440,7 @@
}
if (dontneed_start < rrd_file->file_len) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.124 -r1.125 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 30 Apr 2009 21:41:24 -0000 1.124
+++ openpkg-src/rrdtool/rrdtool.spec 19 May 2009 17:22:37 -0000 1.125
@@ -22,7 +22,7 @@
##
# package version
-%define V_rrdtool 1.3.7
+%define V_rrdtool 1.3.8
%define V_rrdtool_oo 0.25
%define V_rrdtool_creator 0.9
%define V_rrd_simple 1.44
@@ -38,7 +38,7 @@
Group: Database
License: LGPL
Version: %{V_rrdtool}
-Release: 20090430
+Release: 20090519
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
