upgrading package: rrdtool 1.4.5 -> 1.4.6

rrdtool/rrdtool.patch

@@ -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
++++ RRDTool-OO-0.31/Makefile.PL	2012-01-17 19:09:17.000000000 +0100
 @@ -10,52 +10,12 @@
      }
  };
@@ -56,7 +56,7 @@ Index: RRDTool-OO-0.31/Makefile.PL
      $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
++++ RRDTool-OO-0.31/lib/RRDTool/OO.pm	2012-01-17 19:09:17.000000000 +0100
 @@ -5,7 +5,6 @@
  use warnings;
  use Carp;
@@ -84,49 +84,45 @@ Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm
              }
          }
 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,36 +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.
- 
--# 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"};
--	        /bsd/     && do{ $R = "-R$rp"};
--                /aix/     && do{ $R = "-blibpath:$rp"};
+--- bindings/perl-shared/Makefile.PL.orig	2011-12-15 17:07:05.000000000 +0100
++++ bindings/perl-shared/Makefile.PL	2012-01-17 19:11:59.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 ... 
+-	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"};
+-			/bsd/     && do{ $R = "-R$rp"};
+-			/aix/     && do{ $R = "-blibpath:$rp"};
+-		}
 -	}
--}
 -
--# darwin works without this because librrd contains its
--# install_name which will includes the final location of the
--# library after it is installed. This install_name gets transfered
--# to the perl shared object.
--
--my $librrd;
--if ($^O eq 'darwin'){
+-	# darwin works without this because librrd contains its
+-	# install_name which will includes the final location of the
+-	# library after it is installed. This install_name gets transfered
+-	# to the perl shared object.
+-	my $librrd;
+-	if ($^O eq 'darwin'){
 -        $librrd = '-lrrd';
--}
--else {
--        $librrd = "-L../../src/.libs/ $R -lrrd";
--}
-+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";
+-	} else {
+-		$librrd = "-L../../src/.libs/ $R -lrrd";
+-	}
++    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',
+ 	WriteMakefile(
+ 		'NAME'         => 'RRDs',
 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-01-17 19:09:17.000000000 +0100
 @@ -47,7 +47,7 @@
            Extension(
              "rrdtoolmodule",
@@ -137,71 +133,71 @@ Index: bindings/python/setup.py
              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
-@@ -24785,13 +24785,13 @@
-  if test "x""" != "x"; then
-    CPPFLAGS="$CPPFLAGS -I"""
-  fi
--  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib-2.0" >&5
--$as_echo_n "checking for glib_check_version in -lglib-2.0... " >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib2" >&5
-+$as_echo_n "checking for glib_check_version in -lglib2... " >&6; }
- if test "${ac_cv_lib_glib_2_0_glib_check_version+set}" = set; then
+--- configure.orig	2012-01-16 15:44:36.000000000 +0100
++++ configure	2012-01-17 19:12:44.000000000 +0100
+@@ -25351,7 +25351,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lglib-2.0  $LIBS"
-+LIBS="-lglib2  $LIBS"
+-LIBS="-lpangocairo-1.0  $LIBS"
++LIBS="-lpangocairo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24980,7 +24980,7 @@
+@@ -25540,7 +25540,7 @@
  
  fi
- if test "x$ac_cv_header_glib_h" = x""yes; then
--  LIBS="-lglib-2.0 ${LIBS}";EX_CHECK_STATE=YES
-+  LIBS="-lglib2 ${LIBS}";EX_CHECK_STATE=YES
+ if test "x$ac_cv_header_pango_pango_h" = x""yes; then
+-  LIBS="-lpangocairo-1.0 ${LIBS}";EX_CHECK_STATE=YES
++  LIBS="-lpangocairo ${LIBS}";EX_CHECK_STATE=YES
  fi
  
  
-@@ -25043,7 +25043,7 @@
+@@ -25603,7 +25603,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lglib-2.0  $LIBS"
-+LIBS="-lglib2  $LIBS"
+-LIBS="-lpangocairo-1.0  $LIBS"
++LIBS="-lpangocairo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25335,7 +25335,7 @@
+@@ -25891,13 +25891,13 @@
+  if test "x""" != "x"; then
+    CPPFLAGS="$CPPFLAGS -I"""
+  fi
+-  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib-2.0" >&5
+-$as_echo_n "checking for glib_check_version in -lglib-2.0... " >&6; }
++  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib2" >&5
++$as_echo_n "checking for glib_check_version in -lglib2... " >&6; }
+ if test "${ac_cv_lib_glib_2_0_glib_check_version+set}" = set; then
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpangocairo-1.0  $LIBS"
-+LIBS="-lpangocairo  $LIBS"
+-LIBS="-lglib-2.0  $LIBS"
++LIBS="-lglib2  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25524,7 +25524,7 @@
+@@ -26086,7 +26086,7 @@
  
  fi
- if test "x$ac_cv_header_pango_pango_h" = x""yes; then
--  LIBS="-lpangocairo-1.0 ${LIBS}";EX_CHECK_STATE=YES
-+  LIBS="-lpangocairo ${LIBS}";EX_CHECK_STATE=YES
+ if test "x$ac_cv_header_glib_h" = x""yes; then
+-  LIBS="-lglib-2.0 ${LIBS}";EX_CHECK_STATE=YES
++  LIBS="-lglib2 ${LIBS}";EX_CHECK_STATE=YES
  fi
  
  
-@@ -25587,7 +25587,7 @@
+@@ -26149,7 +26149,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpangocairo-1.0  $LIBS"
-+LIBS="-lpangocairo  $LIBS"
+-LIBS="-lglib-2.0  $LIBS"
++LIBS="-lglib2  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28938,9 +28938,9 @@
+@@ -29500,9 +29500,9 @@
  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
@@ -214,9 +210,9 @@ Index: configure
  
  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
-@@ -113,7 +113,7 @@
+--- src/rrd_daemon.c.orig	2011-12-16 08:29:44.000000000 +0100
++++ src/rrd_daemon.c	2012-01-17 19:09:17.000000000 +0100
+@@ -105,7 +105,7 @@
  #include <tcpd.h>
  #endif /* HAVE_LIBWRAP */
  
@@ -226,9 +222,9 @@ Index: src/rrd_daemon.c
  
  #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
-@@ -265,7 +265,7 @@
+--- src/rrd_open.c.orig	2012-01-16 15:40:06.000000000 +0100
++++ src/rrd_open.c	2012-01-17 19:09:17.000000000 +0100
+@@ -296,7 +296,7 @@
  #endif
      if (rdwr & RRD_CREAT)
          goto out_done;
@@ -237,7 +233,7 @@ Index: src/rrd_open.c
      if (rdwr & RRD_COPY) {
          /* We will read everything in a moment (copying) */
          madvise(data, rrd_file->file_len, MADV_WILLNEED );
-@@ -300,7 +300,7 @@
+@@ -331,7 +331,7 @@
                        rrd->stat_head->version);
          goto out_nullify_head;
      }
@@ -246,7 +242,7 @@ Index: src/rrd_open.c
      /* the ds_def will be needed soonish, so hint accordingly */
      madvise(data + PAGE_START(offset),
              sizeof(ds_def_t) * rrd->stat_head->ds_cnt, MADV_WILLNEED);
-@@ -308,7 +308,7 @@
+@@ -339,7 +339,7 @@
      __rrd_read(rrd->ds_def, ds_def_t,
                 rrd->stat_head->ds_cnt);
  
@@ -255,7 +251,7 @@ Index: src/rrd_open.c
      /* the rra_def will be needed soonish, so hint accordingly */
      madvise(data + PAGE_START(offset),
              sizeof(rra_def_t) * rrd->stat_head->rra_cnt, MADV_WILLNEED);
-@@ -323,7 +323,7 @@
+@@ -354,7 +354,7 @@
              rrd_set_error("live_head_t malloc");
              goto out_close;
          }
@@ -264,7 +260,7 @@ Index: src/rrd_open.c
          /* the live_head will be needed soonish, so hint accordingly */
          madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
  #endif
-@@ -333,7 +333,7 @@
+@@ -364,7 +364,7 @@
          rrd->live_head->last_up = *rrd->legacy_last_up;
          rrd->live_head->last_up_usec = 0;
      } else {
@@ -273,7 +269,7 @@ Index: src/rrd_open.c
          /* the live_head will be needed soonish, so hint accordingly */
          madvise(data + PAGE_START(offset),
                  sizeof(live_head_t), MADV_WILLNEED);
-@@ -504,7 +504,7 @@
+@@ -535,7 +535,7 @@
                         + rrd->rra_ptr[i].cur_row
                         * rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
          if (active_block > dontneed_start) {
@@ -282,7 +278,7 @@ Index: src/rrd_open.c
              madvise(rrd_simple_file->file_start + dontneed_start,
                      active_block - dontneed_start - 1, MADV_DONTNEED);
  #endif
-@@ -529,7 +529,7 @@
+@@ -560,7 +560,7 @@
      }
  
      if (dontneed_start < rrd_file->file_len) {

rrdtool/rrdtool.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_rrdtool          1.4.5
+%define       V_rrdtool          1.4.6
 %define       V_rrdtool_oo       0.31
 %define       V_rrdtool_creator  1.0
 %define       V_rrd_simple       1.44
@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Database
 License:      LGPL
 Version:      %{V_rrdtool}
-Release:      20101228
+Release:      20120117
 
 #   package options
 %option       with_perl        no