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: 14-May-2006 21:10:47
Branch: HEAD Handle: 2006051420104600
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
upgrading package: rrdtool 1.2.12 -> 1.2.13
Summary:
Revision Changes Path
1.11 +103 -11 openpkg-src/rrdtool/rrdtool.patch
1.77 +29 -6 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 6 Jul 2005 14:29:48 -0000 1.10
+++ openpkg-src/rrdtool/rrdtool.patch 14 May 2006 19:10:46 -0000 1.11
@@ -1,20 +1,24 @@
Index: bindings/perl-shared/Makefile.PL
---- bindings/perl-shared/Makefile.PL.orig 2005-07-06 16:06:03 +0200
-+++ bindings/perl-shared/Makefile.PL 2005-07-06 16:20:33 +0200
-@@ -1,24 +1,7 @@
+--- bindings/perl-shared/Makefile.PL.orig 2006-05-04 15:26:28 +0200
++++ bindings/perl-shared/Makefile.PL 2006-05-05 09:19:56 +0200
+@@ -1,28 +1,7 @@
use ExtUtils::MakeMaker;
use Config;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
--# Specify the location of the archive containing PIC compiled object files.
--my $R = "";
--
--
--for ($^O){
-- /linux/ && do{ $R = "-Wl,--rpath -Wl,\$(RPATH)"};
-- /hpux/ && do{ $R = "+b\$(RPATH)"};
-- /solaris/ && do{ $R = "-R\$(RPATH)"};
+-# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
+-# path to librrd.so then the Makefile will be written such that RRDs.so
knows
+-# where to find librrd.so later on ...
+-my $R="";
+-if ($ARGV[-1] =~ /RPATH=(\S+)/){
+- pop @ARGV;
+- my $rp = $1;
+- for ($^O){
+- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
+- /hpux/ && do{ $R = "+b$rp"};
+- /solaris/ && do{ $R = "-R$rp"};
+- }
-}
-
-# darwin works without this because librrd contains its
@@ -27,3 +31,91 @@
WriteMakefile(
'NAME' => 'RRDs',
+Index: RRDTool-OO-0.13/lib/RRDTool/OO.pm
+--- RRDTool-OO-0.13/lib/RRDTool/OO.pm.orig 2005-08-12 07:21:40 +0200
++++ RRDTool-OO-0.13/lib/RRDTool/OO.pm 2006-05-14 20:59:44 +0200
+@@ -5,7 +5,6 @@
+ use warnings;
+ use Carp;
+ use RRDs;
+-use Log::Log4perl qw(:easy);
+
+ our $VERSION = '0.13';
+
+@@ -158,7 +157,7 @@
+ # Check if we got all mandatory parameters
+ for(@{$ref->{mandatory}}) {
+ if(! exists $options_hash{$_}) {
+- Log::Log4perl->get_logger("")->logcroak(
++ croak(
+ "Mandatory parameter '$_' not set " .
+ "in $method() (@{[%mandatory]}) (@$options)");
+ }
+@@ -169,7 +168,7 @@
+ for(keys %options_hash) {
+ if(! exists $optional{$_} and
+ ! exists $mandatory{$_}) {
+- Log::Log4perl->get_logger("")->logcroak(
++ croak(
+ "Illegal parameter '$_' in $method()");
+ }
+ }
+Index: RRDTool-OO-0.13/Makefile.PL
+--- RRDTool-OO-0.13/Makefile.PL.orig 2005-08-12 07:45:16 +0200
++++ RRDTool-OO-0.13/Makefile.PL 2006-05-14 21:01:36 +0200
+@@ -2,55 +2,12 @@
+ use ExtUtils::MakeMaker;
+ use File::Basename;
+
+-# Check if RRDs is installed
+-my $v = rrdtool_version();
+-#print "v=$v\n";
+-
+-eval { require RRDs; };
+-
+- # (1) libcgi is missing on most Linux/FreeBSD systems, and we
+- # 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 $DIST_URL =
+-"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool.tar.gz";;
+-
+-if($@ or !$v or $v < 1.002011) {
+- print <<EOT;
+-This module requires rrdtool 1.2.x and the RRDs module to be
+-installed. They are available in the rrdtool distribution:
+- $DIST_URL
+-EOT
+-
+- $| = 1;
+- print "Do you want me to install it for you right now ([y]/n)?";
+- my $in = <>;
+- chomp $in;
+- if($in =~ /^\s*$/ or $in =~ /y/i) {
+- if($> != 0) {
+- die "\nYou need to be root to do this.\n";
+- }
+- eval { install_RRDs() };
+- if($@) {
+- print $@;
+- note();
+- exit 0;
+- }
+- } else {
+- note();
+- exit 0;
+- }
+-}
+-
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+ WriteMakefile(
+ NAME => 'RRDTool::OO',
+ VERSION_FROM => 'lib/RRDTool/OO.pm', # finds $VERSION
+ PREREQ_PM => {
+- Log::Log4perl => '0.40',
+ RRDs => 0,
+ }, # e.g., Module::Name => 1.1
+ ($] >= 5.005 ? ## Add these new keywords supported since 5.005
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 1 Jan 2006 13:21:33 -0000 1.76
+++ openpkg-src/rrdtool/rrdtool.spec 14 May 2006 19:10:46 -0000 1.77
@@ -22,21 +22,28 @@
## SUCH DAMAGE.
##
+# package version
+%define V_rrdtool 1.2.13
+%define V_rrdtool_oo 0.13
+%define V_rrd_simple 1.31
+
# package information
Name: rrdtool
Summary: Round Robin Database
-URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+URL: http://www.rrdtool.org/
Vendor: Tobias Oetiker
Packager: OpenPKG
Distribution: OpenPKG
Class: BASE
Group: Database
License: LGPL
-Version: 1.2.12
-Release: 20051219
+Version: %{V_rrdtool}
+Release: 20060514
# list of sources
-Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
+Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{V_rrdtool}.tar.gz
+Source1:
http://www.cpan.org/authors/id/M/MS/MSCHILLI/RRDTool-OO-%{V_rrdtool_oo}.tar.gz
+Source2:
http://www.cpan.org/authors/id/N/NI/NICOLAW/RRD-Simple-%{V_rrd_simple}.tar.gz
Patch0: rrdtool.patch
# build information
@@ -61,15 +68,27 @@
%track
prog rrdtool = {
- version = %{version}
+ version = %{V_rrdtool}
url = http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
regex = rrdtool-(__VER__)\.tar\.gz
}
+ prog rrdtool:RRDTool-OO = {
+ version = %{V_rrdtool_oo}
+ url = http://www.cpan.org/authors/id/M/MS/MSCHILLI/
+ regex = RRDTool-OO-(__VER__)\.tar\.gz
+ }
+ prog rrdtool:RRD-Simple = {
+ version = %{V_rrd_simple}
+ url = http://www.cpan.org/authors/id/N/NI/NICOLAW/
+ regex = RRD-Simple-(__VER__)\.tar\.gz
+ }
%prep
%setup -q
+ %setup -q -D -T -a 1
+ %setup -q -D -T -a 2
%patch -p0
- rm -f perl-shared/ntmake.pl
+ rm -f bindings/perl-shared/ntmake.pl
%build
# configure package
@@ -98,6 +117,8 @@
%{l_prefix}/bin/perl-openpkg prepare
%{l_prefix}/bin/perl-openpkg -d bindings/perl-piped configure build
%{l_prefix}/bin/perl-openpkg -d bindings/perl-shared configure build
+ %{l_prefix}/bin/perl-openpkg -d RRDTool-OO-%{V_rrdtool_oo} configure
build
+ %{l_prefix}/bin/perl-openpkg -d RRD-Simple-%{V_rrd_simple} configure
build
%install
rm -rf $RPM_BUILD_ROOT
@@ -112,6 +133,8 @@
# install Perl part
%{l_prefix}/bin/perl-openpkg -d bindings/perl-piped install
%{l_prefix}/bin/perl-openpkg -d bindings/perl-shared install
+ %{l_prefix}/bin/perl-openpkg -d RRDTool-OO-%{V_rrdtool_oo} install
+ %{l_prefix}/bin/perl-openpkg -d RRD-Simple-%{V_rrd_simple} install
# strip down installation hierarchy
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
