1.1 --- a/rrdtool/rrdtool.spec Thu Oct 04 20:00:55 2012 +0200
1.2 +++ b/rrdtool/rrdtool.spec Thu Oct 04 20:04:22 2012 +0200
1.3 @@ -54,11 +54,11 @@
1.4 # build information
1.5 BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module, intltool
1.6 PreReq: OpenPKG, openpkg >= 20100101
1.7 -BuildPreReq: png, zlib, freetype, pango, cairo, libxml
1.8 -PreReq: png, zlib, freetype, pango, cairo, libxml
1.9 +BuildPreReq: png, zlib, freetype, pango, cairo, libpixman, libxml, libffi
1.10 +PreReq: png, zlib, freetype, pango, cairo, libpixman, libxml, libffi
1.11 %if "%{with_perl}" == "yes"
1.12 -BuildPreReq: perl
1.13 -PreReq: perl
1.14 +BuildPreReq: perl, libpixman::with_pic = yes
1.15 +PreReq: perl, libpixman::with_pic = yes
1.16 %endif
1.17 %if "%{with_python}" == "yes"
1.18 BuildPreReq: python
1.19 @@ -117,8 +117,13 @@
1.20 echo "ac_cv_path_PERL=no" >config.cache
1.21 CC="%{l_cc}" \
1.22 CPPFLAGS="%{l_cppflags}" \
1.23 +%if "%{with_perl}" == "yes"
1.24 + CFLAGS="%{l_cflags -O} -fPIC" \
1.25 + LDLAGS="%{l_ldflags} -fPIC" \
1.26 +%else
1.27 CFLAGS="%{l_cflags -O}" \
1.28 LDLAGS="%{l_ldflags}" \
1.29 +%endif
1.30 LIBS="`pkg-config pangocairo --libs`" \
1.31 ./configure \
1.32 --cache-file=./config.cache \
1.33 @@ -155,7 +160,7 @@
1.34 -e 's/^\(install-data-am:\).*/\1/' \
1.35 Makefile
1.36 %{l_make} %{l_mflags} install \
1.37 - DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
1.38 + DESTDIR=$RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT"
1.39
1.40 # install Perl part
1.41 %if "%{with_perl}" == "yes"
