Sun, 19 Apr 2009 14:06:51 +0200
Correct libxml and libiconv dependency problems in build logic.
rrdtool/rrdtool.patch | file | annotate | diff | comparison | revisions | |
rrdtool/rrdtool.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/rrdtool/rrdtool.patch Sun Apr 19 12:38:55 2009 +0200 1.2 +++ b/rrdtool/rrdtool.patch Sun Apr 19 14:06:51 2009 +0200 1.3 @@ -123,7 +123,7 @@ 1.4 -else { 1.5 - $librrd = "-L../../src/.libs/ $R -lrrd"; 1.6 -} 1.7 -+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype -lpng -lz -lart_lgpl"; 1.8 ++my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lxml2 -liconv -lfreetype -lpng -lz -lart_lgpl"; 1.9 1.10 WriteMakefile( 1.11 'NAME' => 'RRDs',
2.1 --- a/rrdtool/rrdtool.spec Sun Apr 19 12:38:55 2009 +0200 2.2 +++ b/rrdtool/rrdtool.spec Sun Apr 19 14:06:51 2009 +0200 2.3 @@ -59,8 +59,8 @@ 2.4 BuildPreReq: png, zlib, freetype, pango, cairo, libxml 2.5 PreReq: png, zlib, freetype, pango, cairo, libxml 2.6 %if "%{with_perl}" == "yes" 2.7 -BuildPreReq: perl, libart 2.8 -PreReq: perl, libart 2.9 +BuildPreReq: perl, perl-xml::with_libxml = yes, libart 2.10 +PreReq: perl, perl-xml::with_libxml = yes, libart 2.11 %endif 2.12 %if "%{with_python}" == "yes" 2.13 BuildPreReq: python