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: 28-Sep-2009 17:42:50
Branch: HEAD Handle: 2009092816424900
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
modifying package: rrdtool-1.3.8 20090921 -> 20090928
Summary:
Revision Changes Path
1.33 +17 -20 openpkg-src/rrdtool/rrdtool.patch
1.129 +2 -2 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.32 -r1.33 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 21 Sep 2009 15:54:18 -0000 1.32
+++ openpkg-src/rrdtool/rrdtool.patch 28 Sep 2009 15:42:49 -0000 1.33
@@ -1,15 +1,13 @@
-Index: RRDTool-OO-0.25/Makefile.PL
---- 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 @@
+Index: RRDTool-OO-0.26/Makefile.PL
+--- RRDTool-OO-0.26/Makefile.PL.orig 2009-09-27 22:19:17 +0200
++++ RRDTool-OO-0.26/Makefile.PL 2009-09-28 17:33:53 +0200
+@@ -2,52 +2,12 @@
use ExtUtils::MakeMaker;
use File::Basename;
-# Check if RRDs is installed
--my $v = rrdtool_version();
--#print "v=$v\n";
-
--eval { require RRDs; };
+-eval "use RRDs 1.2011";
-
- # (1) libcgi is missing on most Linux/FreeBSD systems, and we
- # don't need it anyway.
@@ -20,7 +18,7 @@
-my $DIST_URL =
-"http://oss.oetiker.ch/rrdtool/pub/rrdtool.tar.gz";;
-
--if($@ or !$v or $v < 1.002011) {
+-if($@) {
- print <<EOT;
-This module requires rrdtool 1.2.x and the RRDs module to be
-installed. They are available in the rrdtool distribution:
@@ -28,8 +26,7 @@
-EOT
-
- $| = 1;
-- print "Do you want me to install it for you right now ([y]/n)?";
-- my $in = <>;
+- my $in = prompt ("Do you want me to install it for you right now
(y/n)?","n");
- chomp $in;
- if($in =~ /^\s*$/ or $in =~ /y/i) {
- if($> != 0) {
@@ -57,18 +54,18 @@
RRDs => 0,
}, # 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 2009-04-29 16:42:32 +0200
-+++ RRDTool-OO-0.25/lib/RRDTool/OO.pm 2009-05-19 19:08:24 +0200
+Index: RRDTool-OO-0.26/lib/RRDTool/OO.pm
+--- RRDTool-OO-0.26/lib/RRDTool/OO.pm.orig 2009-09-27 22:28:16 +0200
++++ RRDTool-OO-0.26/lib/RRDTool/OO.pm 2009-09-28 17:32:58 +0200
@@ -5,7 +5,6 @@
use warnings;
use Carp;
use RRDs;
-use Log::Log4perl qw(:easy);
- our $VERSION = '0.25';
+ our $VERSION = '0.26';
-@@ -187,7 +186,7 @@
+@@ -188,7 +187,7 @@
# Check if we got all mandatory parameters
for(@{$ref->{mandatory}}) {
if(! exists $options_hash{$_}) {
@@ -77,7 +74,7 @@
"Mandatory parameter '$_' not set " .
"in $method() (@{[%mandatory]}) (@$options)");
}
-@@ -199,7 +198,7 @@
+@@ -200,7 +199,7 @@
for(keys %options_hash) {
if(! exists $optional{$_} and
! exists $mandatory{$_}) {
@@ -88,7 +85,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 2009-05-19 19:08:24 +0200
++++ bindings/perl-shared/Makefile.PL 2009-09-28 17:32:58 +0200
@@ -1,36 +1,7 @@
use ExtUtils::MakeMaker;
use Config;
@@ -129,7 +126,7 @@
'NAME' => 'RRDs',
Index: bindings/python/setup.py
--- bindings/python/setup.py.orig 2008-03-15 11:39:48 +0100
-+++ bindings/python/setup.py 2009-05-19 19:08:24 +0200
++++ bindings/python/setup.py 2009-09-28 17:32:58 +0200
@@ -47,7 +47,7 @@
Extension(
"rrdtoolmodule",
@@ -141,7 +138,7 @@
)
Index: configure
--- configure.orig 2009-05-19 15:45:23 +0200
-+++ configure 2009-05-19 19:13:50 +0200
++++ configure 2009-09-28 17:32:58 +0200
@@ -23293,7 +23293,7 @@
$as_echo_n "(cached) " >&6
else
@@ -183,7 +180,7 @@
save_CPPFLAGS="$CPPFLAGS"
Index: src/rrd_open.c
--- src/rrd_open.c.orig 2009-05-19 15:45:05 +0200
-+++ src/rrd_open.c 2009-05-19 19:08:24 +0200
++++ src/rrd_open.c 2009-09-28 17:32:58 +0200
@@ -219,7 +219,7 @@
#endif
if (rdwr & RRD_CREAT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.128 -r1.129 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 21 Sep 2009 15:54:18 -0000 1.128
+++ openpkg-src/rrdtool/rrdtool.spec 28 Sep 2009 15:42:49 -0000 1.129
@@ -23,7 +23,7 @@
# package version
%define V_rrdtool 1.3.8
-%define V_rrdtool_oo 0.25
+%define V_rrdtool_oo 0.26
%define V_rrdtool_creator 0.9
%define V_rrd_simple 1.44
@@ -38,7 +38,7 @@
Group: Database
License: LGPL
Version: %{V_rrdtool}
-Release: 20090921
+Release: 20090928
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
