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: 07-Sep-2008 19:59:25
Branch: HEAD Handle: 2008090718592500
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
upgrading package: rrdtool 1.2.27 -> 1.3.2
Summary:
Revision Changes Path
1.25 +112 -23 openpkg-src/rrdtool/rrdtool.patch
1.113 +6 -4 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.24 -r1.25 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 21 May 2008 18:29:49 -0000 1.24
+++ openpkg-src/rrdtool/rrdtool.patch 7 Sep 2008 17:59:25 -0000 1.25
@@ -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-02-17 18:16:36 +0100
++++ RRDTool-OO-0.22/Makefile.PL 2008-09-07 19:55: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.22/lib/RRDTool/OO.pm
---- RRDTool-OO-0.22/lib/RRDTool/OO.pm.orig 2008-01-24 04:39:02 +0100
-+++ RRDTool-OO-0.22/lib/RRDTool/OO.pm 2008-02-17 18:16:36 +0100
+--- 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-09-07 19:55:24 +0200
@@ -5,7 +5,6 @@
use warnings;
use Carp;
use RRDs;
-use Log::Log4perl qw(:easy);
- our $VERSION = '0.21';
+ our $VERSION = '0.22';
-@@ -175,7 +174,7 @@
+@@ -183,7 +182,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)");
}
-@@ -187,7 +186,7 @@
+@@ -195,7 +194,7 @@
for(keys %options_hash) {
if(! exists $optional{$_} and
! exists $mandatory{$_}) {
@@ -87,8 +87,8 @@
}
}
Index: bindings/perl-shared/Makefile.PL
---- bindings/perl-shared/Makefile.PL.orig 2008-02-17 11:26:32 +0100
-+++ bindings/perl-shared/Makefile.PL 2008-02-17 18:16:36 +0100
+--- bindings/perl-shared/Makefile.PL.orig 2008-03-15 11:39:48 +0100
++++ bindings/perl-shared/Makefile.PL 2008-09-07 19:55:24 +0200
@@ -1,30 +1,8 @@
use ExtUtils::MakeMaker;
use Config;
@@ -123,8 +123,8 @@
'NAME' => 'RRDs',
'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
Index: bindings/python/setup.py
---- bindings/python/setup.py.orig 2008-02-17 11:26:32 +0100
-+++ bindings/python/setup.py 2008-02-17 18:16:36 +0100
+--- bindings/python/setup.py.orig 2008-03-15 11:39:48 +0100
++++ bindings/python/setup.py 2008-09-07 19:55:24 +0200
@@ -47,7 +47,7 @@
Extension(
"rrdtoolmodule",
@@ -135,9 +135,44 @@
include_dirs=[include_dir],
)
Index: configure
---- configure.orig 2008-02-17 11:26:46 +0100
-+++ configure 2008-02-17 18:16:36 +0100
-@@ -28385,9 +28385,9 @@
+--- configure.orig 2008-09-06 16:26:14 +0200
++++ configure 2008-09-07 19:55:56 +0200
+@@ -30681,7 +30681,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpango-1.0 $LIBS"
++LIBS="-lpango $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -30864,7 +30864,7 @@
+
+ fi
+ if test $ac_cv_header_pango_pango_h = yes; then
+- LIBS="-lpango-1.0 ${LIBS}";EX_CHECK_STATE=YES
++ LIBS="-lpango ${LIBS}";EX_CHECK_STATE=YES
+ fi
+
+
+@@ -30920,14 +30920,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
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpango-1.0 $LIBS"
++LIBS="-lpango $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -32403,9 +32403,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"`
@@ -149,15 +184,69 @@
fi
save_CPPFLAGS="$CPPFLAGS"
-Index: src/rrd_update.c
---- src/rrd_update.c.orig 2008-02-17 11:26:32 +0100
-+++ src/rrd_update.c 2008-02-17 18:17:35 +0100
-@@ -429,7 +429,7 @@
- fclose(rrd_file);
- return(-1);
+Index: src/rrd_open.c
+--- src/rrd_open.c.orig 2008-09-06 16:24:43 +0200
++++ src/rrd_open.c 2008-09-07 19:55:24 +0200
+@@ -174,7 +174,7 @@
+ #endif
+ if (rdwr & RRD_CREAT)
+ goto out_done;
+-#ifdef USE_MADVISE
++#if defined(USE_MADVISE) && defined(MADV_WILLNEED) &&
defined(MADV_SEQUENTIAL) && defined(MADV_RANDOM)
+ if (rdwr & RRD_COPY) {
+ /* We will read everything in a moment (copying) */
+ madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL);
+@@ -207,7 +207,7 @@
+ rrd->stat_head->version);
+ goto out_nullify_head;
+ }
+-#if defined USE_MADVISE
++#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
+ /* 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);
+@@ -215,7 +215,7 @@
+ __rrd_read(rrd->ds_def, ds_def_t,
+ rrd->stat_head->ds_cnt);
+
+-#if defined USE_MADVISE
++#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
+ /* 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);
+@@ -230,7 +230,7 @@
+ rrd_set_error("live_head_t malloc");
+ goto out_close;
+ }
+-#if defined USE_MADVISE
++#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
+ /* the live_head will be needed soonish, so hint accordingly */
+ madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
+ #endif
+@@ -240,7 +240,7 @@
+ rrd->live_head->last_up = *rrd->legacy_last_up;
+ rrd->live_head->last_up_usec = 0;
+ } else {
+-#if defined USE_MADVISE
++#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
+ /* the live_head will be needed soonish, so hint accordingly */
+ madvise(data + PAGE_START(offset),
+ sizeof(live_head_t), MADV_WILLNEED);
+@@ -340,7 +340,7 @@
+ + rrd->rra_ptr[i].cur_row
+ * rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
+ if (active_block > dontneed_start) {
+-#ifdef USE_MADVISE
++#if defined(USE_MADVISE) && defined(MADV_DONTNEED)
+ madvise(rrd_file->file_start + dontneed_start,
+ active_block - dontneed_start - 1, MADV_DONTNEED);
+ #endif
+@@ -363,7 +363,7 @@
+ rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt *
+ sizeof(rrd_value_t);
}
-#ifdef USE_MADVISE
-+#if defined(HAVE_MADVISE) && defined(MADV_RANDOM)
- /* when we use mmaping we tell the kernel the mmap equivalent
- of POSIX_FADV_RANDOM */
- madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
++#if defined(USE_MADVISE) && defined(MADV_DONTNEED)
+ madvise(rrd_file->file_start + dontneed_start,
+ rrd_file->file_len - dontneed_start, MADV_DONTNEED);
+ #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.112 -r1.113 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 21 May 2008 18:29:49 -0000 1.112
+++ openpkg-src/rrdtool/rrdtool.spec 7 Sep 2008 17:59:25 -0000 1.113
@@ -22,7 +22,7 @@
##
# package version
-%define V_rrdtool 1.2.27
+%define V_rrdtool 1.3.2
%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: 20080521
+Release: 20080907
# package options
%option with_perl no
@@ -56,8 +56,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig,
perl-openpkg >= 5.8.3-20040126, perl-module
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: png, zlib, libart, freetype
-PreReq: png, zlib, libart, freetype
+BuildPreReq: png, zlib, libart, freetype, pango
+PreReq: png, zlib, libart, freetype, pango
%if "%{with_perl}" == "yes"
BuildPreReq: perl
PreReq: perl
@@ -121,6 +121,7 @@
CPPFLAGS="%{l_cppflags libart .}" \
CFLAGS="%{l_cflags -O}" \
LDLAGS="%{l_ldflags}" \
+ LIBS="`pkg-config pangocairo --libs`" \
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
@@ -176,6 +177,7 @@
%endif
rm -rf $RPM_BUILD_ROOT%{l_prefix}/rrdtool-*
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/rrdtutorial.es.1
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
# post-process Perl part
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
