From: oetiker Date: Tue, 25 May 2004 22:07:30 +0000 (+0000) Subject: The rrdtool RPM package was depending on the rrdtool-perl package. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1d34dd374a429b4d20130daae052a895d8c6d8c1;p=rrdtool.git The rrdtool RPM package was depending on the rrdtool-perl package. These changes move the examples, which are primarily perl scripts, in with the rrdtool-perl RPM package, thereby de-coupling the rest of the RRDtool from Perl. Perhaps this is silliness ? If there is no need for rrdtool separate from the Perl modules, let me know, then I'll just create an rrdtool and an rrdtool-devel RPM package (that would be a cleaner build and scripting, anyway). -- Mike Slifcak git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@273 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/rrdtool.spec b/rrdtool.spec index 5b9ab93..3b6db96 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -45,8 +45,7 @@ The RRD Tools Perl modules. %prep %setup -q -n rrdtool-%{cvsdate} -%define deffont %{_datadir}/fonts/VeraMono.ttf -perl -pi -e 's!^(#define\s+RRD_DEFAULT_FONT\s+).*!$1"%{deffont}"!' src/rrd_graph.c +%define deffont %{_datadir}/%{name}/fonts/VeraMono.ttf %build CPPFLAGS="-I/usr/include/libart-2.0 -I/usr/include/freetype2" @@ -79,6 +78,7 @@ mv %{buildroot}/usr/html html mkdir -p %{buildroot}%{perlsite} mv %{buildroot}%{_libdir}/perl/* %{buildroot}%{perlsite} rmdir %{buildroot}%{_libdir}/perl +rm -f %{buildroot}/%{perlsite}/auto/RRDs/RRDs.bs # Fix up the man pages if [ "%{_mandir}" != "/usr/share/man" ]; then @@ -98,8 +98,9 @@ rm -rf %{buildroot} %files %defattr (-, root, root) %doc 00README CONTRIBUTORS COPYING COPYRIGHT ChangeLog NEWS PROJECTS -%doc README THREADS TODO examples -%doc docs examples html +%doc README THREADS TODO +%doc docs/[a-z]* html/[a-z]* +%doc examples/*.cgi %{_bindir}/rrdcgi %{_bindir}/rrdtool %{_bindir}/rrdupdate @@ -119,11 +120,12 @@ rm -rf %{buildroot} %{_libdir}/librrd_th.so %files perl +%doc examples/*.pl +%doc docs/RRD* html/RRD* %defattr (-, root, root) %{perlsite}/RRDp.pm %{perlsite}/RRDs.pm %dir %{perlsite}/auto/RRDs -%{perlsite}/auto/RRDs/RRDs.bs %{perlsite}/auto/RRDs/RRDs.so %{_mandir}/man1/RRDp.1* %{_mandir}/man1/RRDs.1*