# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344450677 -7200 # Node ID ccaf26ae9b81bfebd2f2d2abbd5a262341617625 # Parent 615d51fb3fea02335bfff529a847f5a57f55287d Resynchronize with upstream package maintainer version. diff -r 615d51fb3fea -r ccaf26ae9b81 rrdtool/rrdtool.patch --- a/rrdtool/rrdtool.patch Wed Aug 08 20:29:13 2012 +0200 +++ b/rrdtool/rrdtool.patch Wed Aug 08 20:31:17 2012 +0200 @@ -1,6 +1,6 @@ -Index: RRDTool-OO-0.31/Makefile.PL ---- RRDTool-OO-0.31/Makefile.PL.orig 2010-01-09 00:50:31.000000000 +0100 -+++ RRDTool-OO-0.31/Makefile.PL 2010-12-27 08:45:34.000000000 +0100 +Index: RRDTool-OO-0.32/Makefile.PL +--- RRDTool-OO-0.32/Makefile.PL.orig 2010-06-26 05:32:42.000000000 +0200 ++++ RRDTool-OO-0.32/Makefile.PL 2012-03-08 10:57:56.000000000 +0100 @@ -10,52 +10,12 @@ } }; @@ -54,18 +54,18 @@ RRDs => 0, }, # e.g., Module::Name => 1.1 $ExtUtils::MakeMaker::VERSION >= 6.50 ? (%$meta_merge) : (), -Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm ---- RRDTool-OO-0.31/lib/RRDTool/OO.pm.orig 2010-05-26 02:26:34.000000000 +0200 -+++ RRDTool-OO-0.31/lib/RRDTool/OO.pm 2010-12-27 08:45:34.000000000 +0100 -@@ -5,7 +5,6 @@ - use warnings; +Index: RRDTool-OO-0.32/lib/RRDTool/OO.pm +--- RRDTool-OO-0.32/lib/RRDTool/OO.pm.orig 2012-03-07 17:29:01.000000000 +0100 ++++ RRDTool-OO-0.32/lib/RRDTool/OO.pm 2012-03-08 21:30:51.000000000 +0100 +@@ -6,7 +6,6 @@ use Carp; use RRDs; + use Data::Dumper; -use Log::Log4perl qw(:easy); - our $VERSION = '0.31'; + our $VERSION = '0.32'; -@@ -189,7 +188,7 @@ +@@ -203,7 +202,7 @@ # Check if we got all mandatory parameters for(@{$ref->{mandatory}}) { if(! exists $options_hash{$_}) { @@ -74,7 +74,7 @@ "Mandatory parameter '$_' not set " . "in $method() (@{[%mandatory]}) (@$options)"); } -@@ -201,7 +200,7 @@ +@@ -215,7 +214,7 @@ for(keys %options_hash) { if(! exists $optional{$_} and ! exists $mandatory{$_}) { @@ -84,31 +84,12 @@ } } Index: bindings/perl-shared/Makefile.PL ---- bindings/perl-shared/Makefile.PL.orig 2010-12-17 17:10:20.000000000 +0100 -+++ bindings/perl-shared/Makefile.PL 2010-12-27 08:47:23.000000000 +0100 -@@ -1,52 +1,6 @@ - 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 (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) { -- WriteMakefile( -- 'NAME' => 'RRDs', -- 'VERSION_FROM' => 'RRDs.pm', -- 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL} -D_CRT_SECURE_NO_WARNINGS -DWIN32", -- 'INC' => '-I../../src/ "-IC:/Perl/lib/CORE" -I"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include" -I"C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include"', -- 'LDDLFLAGS' => '-dll -nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86', -- 'LDFLAGS' => '-nologo -opt:ref,icf -ltcg -libpath:"C:\Perl\lib\CORE" -machine:X86', -- 'OPTIMIZE' => '-O2 -MD', -- 'LIBS' => '"..\..\win32\Release\rrdlib.lib" "..\..\win32\Release" "C:\Perl\lib\CORE\perl514.lib" -L../../contrib/lib -L"C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib" -L"C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib" -L"C:\Perl\lib\CORE"', -- 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' }, -- ($] ge '5.005') ? ( -- 'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)', -- 'ABSTRACT' => 'Round Robin Database Tool', -- ) : () -- ); --}else{ +--- bindings/perl-shared/Makefile.PL.orig 2011-12-15 17:07:05.000000000 +0100 ++++ bindings/perl-shared/Makefile.PL 2012-03-08 10:57:56.000000000 +0100 +@@ -20,32 +20,7 @@ + ) : () + ); + }else{ - # 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 ... @@ -135,32 +116,25 @@ - } else { - $librrd = "-L../../src/.libs/ $R -lrrd"; - } -- -+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib @l_pangocairo@"; ++ my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lcairo -lpangocairo -lpixman-1 -lpango -lpangoft2 -lfreetype -lpng -lgobject2 -lgio2 -lgmodule2 -lglib2 -lfontconfig -lfreetype -lxml2 -lexpat -lpcre -lz -liconv -lintl"; + WriteMakefile( 'NAME' => 'RRDs', - 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION -@@ -59,5 +13,4 @@ - 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' }, - ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/ $Config{lddlflags}" ) : () - ); --} - Index: bindings/python/setup.py --- bindings/python/setup.py.orig 2008-03-15 11:39:48.000000000 +0100 -+++ bindings/python/setup.py 2010-12-27 08:45:34.000000000 +0100 ++++ bindings/python/setup.py 2012-03-08 10:57:56.000000000 +0100 @@ -47,7 +47,7 @@ Extension( "rrdtoolmodule", ["rrdtoolmodule.c"], - libraries=['rrd'], -+ libraries=['rrd', 'freetype', 'png', 'z'], ++ libraries=['rrd', 'freetype', 'art_lgpl', 'png', 'z'], library_dirs=[library_dir], include_dirs=[include_dir], ) Index: configure ---- configure.orig 2010-12-26 20:51:06.000000000 +0100 -+++ configure 2010-12-27 08:45:34.000000000 +0100 +--- configure.orig 2012-01-24 11:09:06.000000000 +0100 ++++ configure 2012-03-08 10:57:56.000000000 +0100 @@ -25560,7 +25560,7 @@ $as_echo_n "(cached) " >&6 else @@ -236,8 +210,8 @@ save_CPPFLAGS="$CPPFLAGS" Index: src/rrd_daemon.c ---- src/rrd_daemon.c.orig 2010-12-21 17:06:32.000000000 +0100 -+++ src/rrd_daemon.c 2010-12-27 08:45:34.000000000 +0100 +--- src/rrd_daemon.c.orig 2011-12-16 08:29:44.000000000 +0100 ++++ src/rrd_daemon.c 2012-03-08 10:57:56.000000000 +0100 @@ -105,7 +105,7 @@ #include #endif /* HAVE_LIBWRAP */ @@ -248,8 +222,8 @@ #define RRDD_LOG(severity, ...) \ Index: src/rrd_open.c ---- src/rrd_open.c.orig 2010-12-26 20:24:48.000000000 +0100 -+++ src/rrd_open.c 2010-12-27 08:45:34.000000000 +0100 +--- src/rrd_open.c.orig 2012-01-24 11:08:48.000000000 +0100 ++++ src/rrd_open.c 2012-03-08 10:57:56.000000000 +0100 @@ -296,7 +296,7 @@ #endif if (rdwr & RRD_CREAT) diff -r 615d51fb3fea -r ccaf26ae9b81 rrdtool/rrdtool.spec --- a/rrdtool/rrdtool.spec Wed Aug 08 20:29:13 2012 +0200 +++ b/rrdtool/rrdtool.spec Wed Aug 08 20:31:17 2012 +0200 @@ -1,6 +1,6 @@ ## ## rrdtool.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2009 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -23,7 +23,7 @@ # package version %define V_rrdtool 1.4.7 -%define V_rrdtool_oo 0.31 +%define V_rrdtool_oo 0.32 %define V_rrdtool_creator 1.0 %define V_rrd_simple 1.44 @@ -38,7 +38,7 @@ Group: Database License: LGPL Version: %{V_rrdtool} -Release: 20120208 +Release: 20120308 # package options %option with_perl no @@ -52,10 +52,8 @@ Patch0: rrdtool.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module -PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module, intltool +PreReq: OpenPKG, openpkg >= 20100101 BuildPreReq: png, zlib, freetype, pango, cairo, libxml PreReq: png, zlib, freetype, pango, cairo, libxml %if "%{with_perl}" == "yes" @@ -66,8 +64,6 @@ BuildPreReq: python PreReq: python %endif -AutoReq: no -AutoReqProv: no %description RRD is the Acronym for Round Robin Database. RRD is a system @@ -107,25 +103,17 @@ %setup -q -D -T -a 2 %setup -q -D -T -a 3 %patch -p0 - %{l_shtool} subst \ - -e 's;\-std=c99 *;;g' \ - configure - %{l_shtool} subst \ - -e 's;@l_pangocairo@;`pkg-config pangocairo --libs-only-l`;' \ - bindings/perl-shared/Makefile.PL rm -f bindings/perl-shared/ntmake.pl rm -rf RRDTool-Creator-*/_build %build # configure package - ( echo "ac_cv_path_PERL=no" - echo "ac_cv_have_broken_isfinite=yes" - ) >config.cache + echo "ac_cv_path_PERL=no" >config.cache CC="%{l_cc}" \ CPPFLAGS="%{l_cppflags}" \ CFLAGS="%{l_cflags -O}" \ LDLAGS="%{l_ldflags}" \ - LIBS="`pkg-config pangocairo --libs-only-l`" \ + LIBS="`pkg-config pangocairo --libs`" \ ./configure \ --cache-file=./config.cache \ --prefix=%{l_prefix} \ @@ -138,6 +126,7 @@ --disable-tcl \ --disable-ruby \ --disable-shared \ + --disable-nls \ --enable-rrdcgi # build package @@ -154,14 +143,13 @@ %endif %install - rm -rf $RPM_BUILD_ROOT # install package %{l_shtool} subst \ -e 's/^\(install-data-am:\).*/\1/' \ Makefile %{l_make} %{l_mflags} install \ - DESTDIR=$RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" + DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" # install Perl part %if "%{with_perl}" == "yes" @@ -196,5 +184,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT