diff -r 0348d09236d3 -r 615d51fb3fea rrdtool/rrdtool.spec
--- a/rrdtool/rrdtool.spec	Wed Aug 08 20:27:30 2012 +0200
+++ b/rrdtool/rrdtool.spec	Wed Aug 08 20:29:13 2012 +0200
@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_rrdtool          1.4.5
+%define       V_rrdtool          1.4.7
 %define       V_rrdtool_oo       0.31
 %define       V_rrdtool_creator  1.0
 %define       V_rrd_simple       1.44
@@ -38,7 +38,7 @@
 Group:        Database
 License:      LGPL
 Version:      %{V_rrdtool}
-Release:      20110915
+Release:      20120208
 
 #   package options
 %option       with_perl        no
@@ -54,13 +54,13 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module, intltool
+BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module
 PreReq:       OpenPKG, openpkg >= 20040130
 BuildPreReq:  png, zlib, freetype, pango, cairo, libxml
 PreReq:       png, zlib, freetype, pango, cairo, libxml
 %if "%{with_perl}" == "yes"
-BuildPreReq:  perl, perl-xml::with_libxml = yes, libart
-PreReq:       perl, perl-xml::with_libxml = yes, libart
+BuildPreReq:  perl
+PreReq:       perl
 %endif
 %if "%{with_python}" == "yes"
 BuildPreReq:  python
@@ -110,6 +110,9 @@
     %{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
 
@@ -122,7 +125,7 @@
     CPPFLAGS="%{l_cppflags}" \
     CFLAGS="%{l_cflags -O}" \
     LDLAGS="%{l_ldflags}" \
-    LIBS="`pkg-config pangocairo --libs`" \
+    LIBS="`pkg-config pangocairo --libs-only-l`" \
     ./configure \
         --cache-file=./config.cache \
         --prefix=%{l_prefix} \
@@ -135,8 +138,6 @@
         --disable-tcl \
         --disable-ruby \
         --disable-shared \
-        --enable-local-libpng \
-        --enable-local-zlib \
         --enable-rrdcgi
 
     #   build package
@@ -160,7 +161,7 @@
         -e 's/^\(install-data-am:\).*/\1/' \
         Makefile
     %{l_make} %{l_mflags} install \
-        DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+        DESTDIR=$RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT"
 
     #   install Perl part
 %if "%{with_perl}" == "yes"