diff --git a/rrdtool/rrdtool.spec b/rrdtool/rrdtool.spec index c503abd513..d44def458b 100644 --- a/rrdtool/rrdtool.spec +++ b/rrdtool/rrdtool.spec @@ -22,9 +22,10 @@ ## # package version -%define V_rrdtool 1.2.27 -%define V_rrdtool_oo 0.21 -%define V_rrd_simple 1.44 +%define V_rrdtool 1.2.27 +%define V_rrdtool_oo 0.21 +%define V_rrdtool_creator 0.8 +%define V_rrd_simple 1.44 # package information Name: rrdtool @@ -37,7 +38,7 @@ Class: BASE Group: Database License: LGPL Version: %{V_rrdtool} -Release: 20080217 +Release: 20080310 # package options %option with_perl no @@ -46,7 +47,8 @@ Release: 20080217 # list of sources Source0: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{V_rrdtool}.tar.gz Source1: http://www.cpan.org/authors/id/M/MS/MSCHILLI/RRDTool-OO-%{V_rrdtool_oo}.tar.gz -Source2: http://www.cpan.org/authors/id/N/NI/NICOLAW/RRD-Simple-%{V_rrd_simple}.tar.gz +Source2: http://www.cpan.org/authors/id/J/JA/JACQUELIN/RRDTool-Creator-%{V_rrdtool_creator}.tar.gz +Source3: http://www.cpan.org/authors/id/N/NI/NICOLAW/RRD-Simple-%{V_rrd_simple}.tar.gz Patch0: rrdtool.patch # build information @@ -88,6 +90,11 @@ AutoReqProv: no url = http://www.cpan.org/authors/id/M/MS/MSCHILLI/ regex = RRDTool-OO-(__VER__)\.tar\.gz } + prog rrdtool:RRDTool-Creator = { + version = %{V_rrdtool_creator} + url = http://www.cpan.org/authors/id/J/JA/JACQUELIN/ + regex = RRDTool-Creator-(__VER__)\.tar\.gz + } prog rrdtool:RRD-Simple = { version = %{V_rrd_simple} url = http://www.cpan.org/authors/id/N/NI/NICOLAW/ @@ -98,8 +105,10 @@ AutoReqProv: no %setup -q %setup -q -D -T -a 1 %setup -q -D -T -a 2 + %setup -q -D -T -a 3 %patch -p0 rm -f bindings/perl-shared/ntmake.pl + rm -rf RRDTool-Creator-*/_build %build # configure package @@ -137,6 +146,7 @@ AutoReqProv: no %{l_prefix}/bin/perl-openpkg -d bindings/perl-piped configure build %{l_prefix}/bin/perl-openpkg -d bindings/perl-shared configure build %{l_prefix}/bin/perl-openpkg -d RRDTool-OO-%{V_rrdtool_oo} configure build + %{l_prefix}/bin/perl-openpkg -d RRDTool-Creator-%{V_rrdtool_creator} configure build %{l_prefix}/bin/perl-openpkg -d RRD-Simple-%{V_rrd_simple} configure build %endif @@ -155,6 +165,7 @@ AutoReqProv: no %{l_prefix}/bin/perl-openpkg -d bindings/perl-piped install %{l_prefix}/bin/perl-openpkg -d bindings/perl-shared install %{l_prefix}/bin/perl-openpkg -d RRDTool-OO-%{V_rrdtool_oo} install + %{l_prefix}/bin/perl-openpkg -d RRDTool-Creator-%{V_rrdtool_creator} install %{l_prefix}/bin/perl-openpkg -d RRD-Simple-%{V_rrd_simple} install %endif