- added package - devel and static,

- changed man location to /usr/share/man,
- changed examples location to /usr/src/examples/rrdtools,
- moved contrib to /usr/src/examplec/rrdtool/contrib.

Changed files:
    rrdtool.spec -> 1.10

diff --git a/rrdtool.spec b/rrdtool.spec
index b4a6f8d160d01dab48b904ebc3761abea2a221d4..d9fae5b84be81391d01d9916dbee62209887d00d 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -1,25 +1,47 @@
-Summary:       RRDtool - round robin database
-Name:          rrdtool
-Version:       1.0.28
-Release:       1
-Copyright:     GPL
-Group:                 Applications/Databases
-#Source0:      http://www.caida.org/tools/utilities/rrdtool/pub/%{name}-%{version}.tar.gz
-Source:                http://ee-staff.ethz.ch/~oetiker/webtools/rrdtools/pub/%{name}-%{version}.tar.gz
-#Patch0:       /rrdtool-perl-location.patch
-#Url:          http://www.caida.org/tools/utilites/rrdtool/
+Summary:       RRDtool - round robin database
+Name:          rrdtool
+Version:       1.0.28
+Release:       1
+License:       GPL
+Group:         Applications/Databases
+Group(pl):     Aplikacje/Bazy danych
+Source0:       http://ee-staff.ethz.ch/~oetiker/webtools/rrdtools/pub/%{name}-%{version}.tar.gz
+#Patch0:       /%{name}-perl-location.patch
+#Url:          http://www.caida.org/tools/utilites/rrdtool/
 URL:           http://ee-staff.ethz.ch/~oetiker/webtools/rrdtol/
-#Vendor:       Tobi Oetiker <oetiker@ee.ethz.ch>
+#Vendor:       Tobi Oetiker <oetiker@ee.ethz.ch>
+#BuildRequired:        tcl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define        _prefix /usr
+
 %description
-RRD is the Acronym for Round Robin Database. RRD is a system to store and 
-display time-series data (i.e. network bandwidth, machine-room temperature, 
-server load average). It stores the data in a very compact way that will not 
-expand over time, and it presents useful graphs by processing the data to 
-enforce a certain data density. It can be used either via simple wrapper 
-scripts (from shell or Perl) or via frontends that poll network devices and 
-put a friendly user interface on it.
+RRD is the Acronym for Round Robin Database. RRD is a system to store
+and display time-series data (i.e. network bandwidth, machine-room
+temperature, server load average). It stores the data in a very
+compact way that will not expand over time, and it presents useful
+graphs by processing the data to enforce a certain data density. It
+can be used either via simple wrapper scripts (from shell or Perl) or
+via frontends that poll network devices and put a friendly user
+interface on it.
+
+%package devel
+Summary:       RDDTools development.
+Summary(pl):   Na¿êdzia programistyczne pakietu RRDtools
+Group:         Development/Libraries
+Group(pl):     Programowanie/Biblioteki
+Requires:      %{name}
+%description devel
+%description -l pl devel
+
+%package static
+Summary:       RDDTools static library.
+Summary(pl):   Statycznie linkowana biblioteka RRDtools.
+Group:         Development/Libraries
+Group(pl):     Programowanie/Biblioteki
+Requires:      %{name}-devel
+%description static
+%description -l pl static
 
 %prep
 %setup -q
@@ -29,25 +51,41 @@ put a friendly user interface on it.
 %build
 aclocal
 autoconf
-%configure
+%configure --prefix=%{_prefix} \
+       --enable-shared=yes \
+       --without-tclib
+# uncoment this line ONLY IF tcl package is ready. 
+#      --with-tclib=%{_prefix}
 %{__make}
 
 %install
-%{__make} install PREFIX=$RPM_BUILD_ROOT/usr
+rm -rf $RPM_BUILD_ROOT
+%{__make} imandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
+install -d $RPM_BUILD_ROOT/usr/src/examples/%{name}
+install -d $RPM_BUILD_ROOT/usr/src/examples/%{name}/contrib
+(cd $RPM_BUILD_ROOT/usr/src/examples/%{name};
+cp -Rp ../../../examples/* .;
+cp -Rp ../../../contrib .)
 
 %files
 %defattr(644,root,root,755)
 %doc doc/*.txt
 %doc doc/*.html
-%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
+%doc doc/*.pod
+
+%attr(755,root,root) %{_bindir}/rrd*
+%attr(755,root,root) %{_bindir}/trytime
+
+%attr(644,root,root) %{_libdir}/librrd.so
+%attr(755,root,root) %{_libdir}/librrd.so.0.0.0
+
+%dir %{_libdir}/perl
+%attr(644,root,root) %{_mandir}/man/man1/*
+
+%files static
+%attr(644,root,root) %{_libdir}/librrd.a
+%attr(755,root,root) %{_libdir}/librrd.la
+
+%files devel
+%attr(644,root,root) %{_libdir}/librrd.so.0
+%dir %{_examplesdir}/%{name}