- some cleanups

- updated to 1.0.7
NFY

Changed files:
    rrdtool.spec -> 1.2

diff --git a/rrdtool.spec b/rrdtool.spec
index 4815898aa0db99a071e18f9acaa920a7f80fefcf..b7e993ac200f4ea9455df011774a5114b60f76b1 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -1,16 +1,14 @@
-Summary: RRDtool - round robin database
-Name: rrdtool
-Version: 1.0.6
-Release: 0
-Copyright: GPL
-Group: Applications/Databases
-Source0: http://www.caida.org/Tools/RRDtool/pub/rrdtool-1.0.6.tar.gz
-Patch0: /rrdtool-perl-location.patch
-Buildroot: /var/tmp/rrdtool-root
-Prefix: /usr
-Packager: Ragnar Kjørstad <rrdtool@ragnark.vestdata.no>
-Url: http://www.caida.org/Tools/RRDtool/
-Vendor: Tobi Oetiker <oetiker@ee.ethz.ch>
+Summary:       RRDtool - round robin database
+Name:          rrdtool
+Version:       1.0.7
+Release:       1
+Copyright:     GPL
+Group:                 Applications/Databases
+Source0:       http://www.caida.org/Tools/RRDtool/pub/%{name}-%{version}.tar.gz
+#Patch0:       /rrdtool-perl-location.patch
+Url:           http://www.caida.org/Tools/RRDtool/
+Vendor:        Tobi Oetiker <oetiker@ee.ethz.ch>
+Buildroot:     /tmp/%{name}-%{version}-root
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and 
@@ -23,40 +21,31 @@ put a friendly user interface on it.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
+#mv contrib/log2rrd/log2rrd.pl contrib/log2rrd/log2rrd.pl.in
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix="/usr" 
+aclocal
+autoconf
+%configure
 make
 
 %install
 make install PREFIX=$RPM_BUILD_ROOT/usr
 
 %files
-/usr/bin/rrdtool
-/usr/bin/rrdcgi
-%doc /usr/man/man3/RRDp.3
-%doc /usr/man/man3/RRDs.3
-%doc /usr/man/man1/bin_dec_hex.1
-%doc /usr/man/man1/rrdcgi.1
-%doc /usr/man/man1/rrdcreate.1
-%doc /usr/man/man1/rrddump.1
-%doc /usr/man/man1/rrdfetch.1
-%doc /usr/man/man1/rrdgraph.1
-%doc /usr/man/man1/rrdlast.1
-%doc /usr/man/man1/rrdresize.1
-%doc /usr/man/man1/rrdrestore.1
-%doc /usr/man/man1/rrdtool.1
-%doc /usr/man/man1/rrdtune.1
-%doc /usr/man/man1/rrdtutorial.1
-%doc /usr/man/man1/rrdupdate.1
+%defattr(644,root,root,755)
 %doc doc/*.txt
 %doc doc/*.html
-/usr/lib/perl/auto/RRDs/RRDs.bs
-/usr/lib/perl/auto/RRDs/RRDs.so
-/usr/lib/perl/RRDp.pm
-/usr/lib/perl/RRDs.pm
 %doc examples/piped-demo.pl
 %doc examples/shared-demo.pl
 %doc examples/cgi-demo.cgi
 %doc contrib
+
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man*/*
+
+/usr/lib/perl/auto/RRDs/RRDs.bs
+/usr/lib/perl/auto/RRDs/RRDs.so
+/usr/lib/perl/RRDp.pm
+/usr/lib/perl/RRDs.pm