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. <http://openpkg.net/>
+##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  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