1.1 --- a/rrdtool/rrdtool.spec Wed Aug 08 20:27:30 2012 +0200
1.2 +++ b/rrdtool/rrdtool.spec Wed Aug 08 20:29:13 2012 +0200
1.3 @@ -22,7 +22,7 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_rrdtool 1.4.5
1.8 +%define V_rrdtool 1.4.7
1.9 %define V_rrdtool_oo 0.31
1.10 %define V_rrdtool_creator 1.0
1.11 %define V_rrd_simple 1.44
1.12 @@ -38,7 +38,7 @@
1.13 Group: Database
1.14 License: LGPL
1.15 Version: %{V_rrdtool}
1.16 -Release: 20110915
1.17 +Release: 20120208
1.18
1.19 # package options
1.20 %option with_perl no
1.21 @@ -54,13 +54,13 @@
1.22 # build information
1.23 Prefix: %{l_prefix}
1.24 BuildRoot: %{l_buildroot}
1.25 -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module, intltool
1.26 +BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module
1.27 PreReq: OpenPKG, openpkg >= 20040130
1.28 BuildPreReq: png, zlib, freetype, pango, cairo, libxml
1.29 PreReq: png, zlib, freetype, pango, cairo, libxml
1.30 %if "%{with_perl}" == "yes"
1.31 -BuildPreReq: perl, perl-xml::with_libxml = yes, libart
1.32 -PreReq: perl, perl-xml::with_libxml = yes, libart
1.33 +BuildPreReq: perl
1.34 +PreReq: perl
1.35 %endif
1.36 %if "%{with_python}" == "yes"
1.37 BuildPreReq: python
1.38 @@ -110,6 +110,9 @@
1.39 %{l_shtool} subst \
1.40 -e 's;\-std=c99 *;;g' \
1.41 configure
1.42 + %{l_shtool} subst \
1.43 + -e 's;@l_pangocairo@;`pkg-config pangocairo --libs-only-l`;' \
1.44 + bindings/perl-shared/Makefile.PL
1.45 rm -f bindings/perl-shared/ntmake.pl
1.46 rm -rf RRDTool-Creator-*/_build
1.47
1.48 @@ -122,7 +125,7 @@
1.49 CPPFLAGS="%{l_cppflags}" \
1.50 CFLAGS="%{l_cflags -O}" \
1.51 LDLAGS="%{l_ldflags}" \
1.52 - LIBS="`pkg-config pangocairo --libs`" \
1.53 + LIBS="`pkg-config pangocairo --libs-only-l`" \
1.54 ./configure \
1.55 --cache-file=./config.cache \
1.56 --prefix=%{l_prefix} \
1.57 @@ -135,8 +138,6 @@
1.58 --disable-tcl \
1.59 --disable-ruby \
1.60 --disable-shared \
1.61 - --enable-local-libpng \
1.62 - --enable-local-zlib \
1.63 --enable-rrdcgi
1.64
1.65 # build package
1.66 @@ -160,7 +161,7 @@
1.67 -e 's/^\(install-data-am:\).*/\1/' \
1.68 Makefile
1.69 %{l_make} %{l_mflags} install \
1.70 - DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
1.71 + DESTDIR=$RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT"
1.72
1.73 # install Perl part
1.74 %if "%{with_perl}" == "yes"
