OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jul-2006 17:57:04
Branch: HEAD Handle: 2006071416570301
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
upgrading package: rrdtool 1.2.13 -> 1.2.15
Summary:
Revision Changes Path
1.13 +8 -5 openpkg-src/rrdtool/rrdtool.patch
1.85 +2 -2 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 15 May 2006 07:36:05 -0000 1.12
+++ openpkg-src/rrdtool/rrdtool.patch 14 Jul 2006 15:57:03 -0000 1.13
@@ -1,12 +1,12 @@
Index: bindings/perl-shared/Makefile.PL
---- 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 @@
+--- bindings/perl-shared/Makefile.PL.orig 2006-07-14 14:11:26 +0200
++++ bindings/perl-shared/Makefile.PL 2006-07-14 17:52:24 +0200
+@@ -1,30 +1,8 @@
use ExtUtils::MakeMaker;
use Config;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-
+-
-# 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 ...
@@ -18,6 +18,7 @@
- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
- /hpux/ && do{ $R = "+b$rp"};
- /solaris/ && do{ $R = "-R$rp"};
+- /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
- }
-}
-
@@ -27,10 +28,12 @@
-# to the perl shared object.
-
-my $librrd = "-L../../src/.libs/ $R -lrrd";
-+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype
-lpng -lz -lart_lgpl";
++my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype
-lpng -lz -lart_lgpl";
++
WriteMakefile(
'NAME' => 'RRDs',
+ 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
Index: RRDTool-OO-0.14/lib/RRDTool/OO.pm
--- RRDTool-OO-0.14/lib/RRDTool/OO.pm.orig 2005-08-12 07:21:40 +0200
+++ RRDTool-OO-0.14/lib/RRDTool/OO.pm 2006-05-14 20:59:44 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 27 Jun 2006 06:49:41 -0000 1.84
+++ openpkg-src/rrdtool/rrdtool.spec 14 Jul 2006 15:57:04 -0000 1.85
@@ -23,7 +23,7 @@
##
# package version
-%define V_rrdtool 1.2.13
+%define V_rrdtool 1.2.15
%define V_rrdtool_oo 0.14
%define V_rrd_simple 1.39
@@ -38,7 +38,7 @@
Group: Database
License: LGPL
Version: %{V_rrdtool}
-Release: 20060627
+Release: 20060714
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{V_rrdtool}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
