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: 23-Jan-2008 21:07:53
Branch: HEAD Handle: 2008012320075300
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
modifying package: rrdtool-1.2.26 20080101 -> 20080123
Summary:
Revision Changes Path
1.21 +20 -20 openpkg-src/rrdtool/rrdtool.patch
1.106 +2 -2 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.20 -r1.21 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 3 Dec 2007 07:28:39 -0000 1.20
+++ openpkg-src/rrdtool/rrdtool.patch 23 Jan 2008 20:07:53 -0000 1.21
@@ -1,6 +1,6 @@
-Index: RRDTool-OO-0.19/Makefile.PL
---- RRDTool-OO-0.19/Makefile.PL.orig 2006-09-10 19:21:18 +0200
-+++ RRDTool-OO-0.19/Makefile.PL 2007-05-14 10:07:38 +0200
+Index: RRDTool-OO-0.20/Makefile.PL
+--- RRDTool-OO-0.20/Makefile.PL.orig 2008-01-23 08:19:20 +0100
++++ RRDTool-OO-0.20/Makefile.PL 2008-01-23 21:05:33 +0100
@@ -2,55 +2,12 @@
use ExtUtils::MakeMaker;
use File::Basename;
@@ -15,10 +15,10 @@
- # don't need it anyway.
- # (2) as of rrdtool-1.2.11, tcl libs didn't compile, so let's
- # leave them out.
--my $CONFIGURE_OPTS = "--prefix=/usr --disable-tcl --disable-rrdcgi";
+-my $CONFIGURE_OPTS = "--enable-perl-site-install --prefix=/usr
--disable-tcl --disable-rrdcgi";
-
-my $DIST_URL =
--"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool.tar.gz";;
+-"http://oss.oetiker.ch/rrdtool/pub/rrdtool.tar.gz";;
-
-if($@ or !$v or $v < 1.002011) {
- print <<EOT;
@@ -57,16 +57,16 @@
RRDs => 0,
}, # e.g., Module::Name => 1.1
($] >= 5.005 ? ## Add these new keywords supported since 5.005
-Index: RRDTool-OO-0.19/lib/RRDTool/OO.pm
---- RRDTool-OO-0.19/lib/RRDTool/OO.pm.orig 2007-05-13 05:59:48 +0200
-+++ RRDTool-OO-0.19/lib/RRDTool/OO.pm 2007-05-14 10:08:51 +0200
+Index: RRDTool-OO-0.20/lib/RRDTool/OO.pm
+--- RRDTool-OO-0.20/lib/RRDTool/OO.pm.orig 2008-01-23 08:23:52 +0100
++++ RRDTool-OO-0.20/lib/RRDTool/OO.pm 2008-01-23 21:02:36 +0100
@@ -5,7 +5,6 @@
use warnings;
use Carp;
use RRDs;
-use Log::Log4perl qw(:easy);
- our $VERSION = '0.19';
+ our $VERSION = '0.20';
@@ -173,7 +172,7 @@
# Check if we got all mandatory parameters
@@ -87,8 +87,8 @@
}
}
Index: bindings/perl-shared/Makefile.PL
---- bindings/perl-shared/Makefile.PL.orig 2007-05-02 20:06:11 +0200
-+++ bindings/perl-shared/Makefile.PL 2007-05-14 10:07:38 +0200
+--- bindings/perl-shared/Makefile.PL.orig 2007-11-20 01:15:10 +0100
++++ bindings/perl-shared/Makefile.PL 2008-01-23 21:02:36 +0100
@@ -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 2007-11-13 03:22:56 +0100
-+++ bindings/python/setup.py 2007-11-13 17:42:42 +0100
+--- bindings/python/setup.py.orig 2007-11-20 01:15:10 +0100
++++ bindings/python/setup.py 2008-01-23 21:02:36 +0100
@@ -47,7 +47,7 @@
Extension(
"rrdtoolmodule",
@@ -135,10 +135,10 @@
include_dirs=[include_dir],
)
Index: configure
---- configure.orig 2007-05-02 20:07:06 +0200
-+++ configure 2007-08-03 04:37:34 +0200
-@@ -27259,9 +27259,9 @@
- echo $ECHO_N "checking for headers required to compile python extensions...
$ECHO_C" >&6
+--- configure.orig 2007-11-20 01:15:34 +0100
++++ configure 2008-01-23 21:02:36 +0100
+@@ -27321,9 +27321,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"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
@@ -147,11 +147,11 @@
- PYTHON_INCLUDES="$PYTHON_INCLUDES
-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ PYTHON_INCLUDES="$PYTHON_INCLUDES
-I${py_exec_prefix}/include/python${PYTHON_VERSION}
-I${py_exec_prefix}/include/python"
fi
-
+
save_CPPFLAGS="$CPPFLAGS"
Index: src/rrd_update.c
---- src/rrd_update.c.orig 2007-11-20 01:15:10.000000000 +0100
-+++ src/rrd_update.c 2007-12-03 08:21:28.584206100 +0100
+--- src/rrd_update.c.orig 2007-11-20 01:15:10 +0100
++++ src/rrd_update.c 2008-01-23 21:02:36 +0100
@@ -427,7 +427,7 @@
fclose(rrd_file);
return(-1);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.105 -r1.106 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 1 Jan 2008 15:04:02 -0000 1.105
+++ openpkg-src/rrdtool/rrdtool.spec 23 Jan 2008 20:07:53 -0000 1.106
@@ -23,7 +23,7 @@
# package version
%define V_rrdtool 1.2.26
-%define V_rrdtool_oo 0.19
+%define V_rrdtool_oo 0.20
%define V_rrd_simple 1.43
# package information
@@ -37,7 +37,7 @@
Group: Database
License: LGPL
Version: %{V_rrdtool}
-Release: 20080101
+Release: 20080123
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
