# HG changeset patch # User Michael Schloh von Bennewitz # Date 1240142811 -7200 # Node ID 88a7941704d27e4ab6c44228c9fbb8b760419326 # Parent 00f30de09998030e066a16b538f70c1b15c92fcf Correct libxml and libiconv dependency problems in build logic. diff -r 00f30de09998 -r 88a7941704d2 rrdtool/rrdtool.patch --- a/rrdtool/rrdtool.patch Sun Apr 19 12:38:55 2009 +0200 +++ b/rrdtool/rrdtool.patch Sun Apr 19 14:06:51 2009 +0200 @@ -123,7 +123,7 @@ -else { - $librrd = "-L../../src/.libs/ $R -lrrd"; -} -+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype -lpng -lz -lart_lgpl"; ++my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lxml2 -liconv -lfreetype -lpng -lz -lart_lgpl"; WriteMakefile( 'NAME' => 'RRDs', diff -r 00f30de09998 -r 88a7941704d2 rrdtool/rrdtool.spec --- a/rrdtool/rrdtool.spec Sun Apr 19 12:38:55 2009 +0200 +++ b/rrdtool/rrdtool.spec Sun Apr 19 14:06:51 2009 +0200 @@ -59,8 +59,8 @@ BuildPreReq: png, zlib, freetype, pango, cairo, libxml PreReq: png, zlib, freetype, pango, cairo, libxml %if "%{with_perl}" == "yes" -BuildPreReq: perl, libart -PreReq: perl, libart +BuildPreReq: perl, perl-xml::with_libxml = yes, libart +PreReq: perl, perl-xml::with_libxml = yes, libart %endif %if "%{with_python}" == "yes" BuildPreReq: python