X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=rrdtool.spec;h=c8a7462de5c2553ce26cb44d6d20eeb63863cb44;hp=d7ac1d7b9bd7eba6374a633f3fa4905c2dae8429;hb=f207955a7e325708d056d3dd912863dc9930a71c;hpb=ef4769d9bcd172c0c7fd198dcffdc63b19db3561

diff --git a/rrdtool.spec b/rrdtool.spec
index d7ac1d7..c8a7462 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -4,11 +4,11 @@
 
 Summary: Round Robin Database Tools
 Name: rrdtool
-Version: 1.1.0
+Version: 1.2rc6
 Release: %{cvsver}
 License: GPL
-Group: Applications/Networking
-Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/rrdtool-cvs-snap.tar.gz
+Group: Applications/Databases
+Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/rrdtool-1.2rc1.tar.gz
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Buildroot: /tmp/%{name}-root
 
@@ -29,15 +29,15 @@ values collected over a definable time period.
 %package devel
 Summary: RRD Tool development libraries and header files
 Group: Development/Libraries
-Requires: rrdtool = %{version}-%{release}
+Requires: %{name} = %{version}
 
 %description devel
 The RRD Tools development library.
 
 %package perl
 Summary: RRD Tool Perl interface
-Group: Applications/Networking
-Requires: rrdtool = %{version}-%{release}
+Group: Applications/Databases
+Requires: %{name} = %{version}
 
 %description perl
 The RRD Tools Perl modules.
@@ -45,20 +45,11 @@ The RRD Tools Perl modules.
 %prep
 %setup -q -n rrdtool-%{cvsdate}
 
-mkdir config
-cd config
-ln -s ../mkinstalldirs .
-cd ..
-
-%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"
 export CPPFLAGS
-aclocal > /tmp/aclocal.out 2>&1
-automake
-autoconf
 %configure
 make
 
@@ -84,6 +75,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
@@ -102,9 +94,10 @@ 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 00README CONTRIBUTORS COPYING COPYRIGHT NEWS PROJECTS
+%doc README THREADS TODO
+%doc docs/[a-z]* html/[a-z]*
+%doc examples/*.cgi
 %{_bindir}/rrdcgi
 %{_bindir}/rrdtool
 %{_bindir}/rrdupdate
@@ -124,15 +117,18 @@ 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*
 
 %changelog
+* Wed May 26 2004 Mike Slifcak <slif@bellsouth.net> 1.1.0-0.1.20040526
+- package examples with rrdtool-perl (decouple Perl from main package)
 * Thu Apr 29 2004 Chris Adams <cmadams@hiwaay.net> 1.1.0-0.1.20040430
 - initial build