sync up with Dag Wieers version from http://dag.wieers.com/packages/rrdtool/rrdtool...

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@611 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/rrdtool.spec b/program/rrdtool.spec
index e86b453c478c1a46b180f4de763912166277bd7d..a15cd6e7ea574f28f9dfc251004a45f399b2a731 100644 (file)
--- a/program/rrdtool.spec
+++ b/program/rrdtool.spec
@@ -1,149 +1,241 @@
-%define cvsdate cvs-snap
-%define cvsver %(echo %{cvsdate} | tr -d -)
-%define sover 1.0.0
+# $Id$
+# Authority: matthias
+# Upstream: Tobi Oetiker <oetiker$ee,ethz,ch>
 
-Summary: Round Robin Database Tools
+# Tag: test
+
+%{?fc1:%define _without_python 1}
+%{?el3:%define _without_python 1}
+%{?rh9:%define _without_python 1}
+%{?rh7:%define _without_python 1}
+%{?el2:%define _without_python 1}
+
+%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
+%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
+%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
+%define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')
+
+Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.2.9
-Release: %{cvsver}
+Release: 1.test
 License: GPL
 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
 
-BuildRequires: perl
-BuildRequires: cgilib-devel
-BuildRequires: freetype-devel libart_lgpl-devel libpng-devel zlib-devel
+Packager: Dag Wieers <dag@wieers.com>
+Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
+
+Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++, openssl-devel, libart_lgpl-devel >= 2.0, cgilib-devel
+BuildRequires: libpng-devel, zlib-devel, freetype-devel
+%{!?_without_python:BuildRequires: python-devel >= 2.3}
+Requires: perl >= %(rpm -q --qf '%%{epoch}:%%{version}' perl)
 
 %description
-It is pretty easy to gather status information from all sorts of things,
-ranging from the temperature in your office to the number of octets which
-have passed through the FDDI interface of your router. But it is not so
-trivial to store this data in a efficient and systematic manner. This is
-where RRDtool kicks in. It lets you log and analyze the data you gather from
-all kinds of data-sources (DS). The data analysis part of RRDtool is based
-on the ability to quickly generate graphical representations of the data
-values collected over a definable time period.
+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: RRD Tool development libraries and header files
+Summary: RRDtool static libraries and header files
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
 %description devel
-The RRD Tools development library.
+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). This package allow you to use directly this library.
 
-%package perl
-Summary: RRD Tool Perl interface
-Group: Applications/Databases
+%package -n perl-rrdtool
+Summary: Perl RRDtool bindings
+Group: Development/Languages
 Requires: %{name} = %{version}
+Obsoletes: rrdtool-perl <= %{version}
 
-%description perl
-The RRD Tools Perl modules.
+%description -n perl-rrdtool
+The Perl RRDtool bindings
 
-%package python
-Summary: RRD Tool Python interface
-Group: Applications/Databases
-Requires: %{name} = %{version} python >= 2.3
+%package -n python-rrdtool
+Summary: Python RRDtool bindings
+Group: Development/Languages
+BuildRequires: python
+Requires: python >= %{python_version}
+Requires: %{name} = %{version}
 
-%description python
-The RRD Tools Python modules.
+%description -n python-rrdtool
+Python RRDtool bindings.
+
+%package -n php-rrdtool
+Summary: RRDtool module for PHP
+Group: Development/Languages
+Requires: %{name} = %{version}, php >= 4.0
+
+%description -n php-rrdtool
+The php-%{name} package includes a dynamic shared object (DSO) that adds
+RRDtool bindings to the PHP HTML-embedded scripting language.
 
 %prep
-%setup -q -n rrdtool-%{cvsdate}
-%prep
-%setup -q -n rrdtool-%{cvsdate}
+%setup
 
-%define deffont %{_datadir}/%{name}/fonts/VeraMono.ttf
+### FIXME: Fixes to /usr/lib(64) for x86_64
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure Makefile.in
 
 %build
-CPPFLAGS="-I/usr/include/libart-2.0 -I/usr/include/freetype2"
-export CPPFLAGS
-%configure
-make
+%configure \
+       --enable-perl-site-install \
+       --with-perl-options='INSTALLDIRS="vendor"'
+#      --with-tcllib="%{_libdir}"
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-%makeinstall
-
-# Install the font
-mkdir -p %{buildroot}%{_datadir}/fonts
-install -m 644 src/VeraMono.ttf %{buildroot}%{deffont}
-
-# Fix up the documentation
-[ -d docs ] && mv docs docs.src
-mv %{buildroot}/usr/doc docs
-rm -f docs/*.pod
-[ -d examples ] && mv examples examples.src
-mv %{buildroot}/usr/examples examples
-[ -d html ] && mv html html.src
-mv %{buildroot}/usr/html html
-
-# Fix up the perl
-%define perlsite %(perl -MConfig -e 'print $Config{"installsitearch"}')
-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
-       mkdir -p %{buildroot}%{_mandir}
-       mv %{buildroot}/usr/man/* %{buildroot}%{_mandir}/
-fi
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
-%clean
-rm -rf %{buildroot}
+### We only want .txt and .html files for the main documentation
+%{__mkdir_p} rpm-doc/docs/
+%{__cp} -ap doc/*.txt doc/*.html rpm-doc/docs/
 
+%{__rm} -f examples/Makefile* examples/*.in
+
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{perl_archlib} \
+               %{buildroot}%{perl_vendorarch}/auto/*{,/*{,/*}}/.packlist
+%{__rm} -f %{buildroot}%{perl_vendorarch}/ntmake.pl
+
+%clean
+%{__rm} -rf %{buildroot}
+ 
 %files
-%defattr (-, root, root)
-%doc 00README CONTRIBUTORS COPYING COPYRIGHT NEWS PROJECTS
-%doc README THREADS TODO
-%doc docs/[a-z]* html/[a-z]*
-%doc examples/*.cgi
+%defattr(-, root, root, 0755)
+%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT NEWS README THREADS TODO
+%doc rpm-doc/docs/ examples/
+%doc %{_mandir}/man1/*.1*
 %{_bindir}/rrdcgi
 %{_bindir}/rrdtool
 %{_bindir}/rrdupdate
-%{_libdir}/librrd.so.%{sover}
-%{_libdir}/librrd_th.so.%{sover}
-%{_mandir}/man1/[a-z]*
-%{deffont}
+%{_libdir}/librrd.so.*
+%{_libdir}/librrd_th.so.*
+%{_datadir}/rrdtool/
+%exclude %{_prefix}/shared/
 
 %files devel
-%defattr (-, root, root)
+%defattr(-, root, root, 0755)
 %{_includedir}/rrd.h
 %{_libdir}/librrd.a
-%{_libdir}/librrd.la
-%{_libdir}/librrd.so
 %{_libdir}/librrd_th.a
-%{_libdir}/librrd_th.la
+%exclude %{_libdir}/librrd.la
+%exclude %{_libdir}/librrd_th.la
+%{_libdir}/librrd.so
 %{_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.so
-%{_mandir}/man1/RRDp.1*
-%{_mandir}/man1/RRDs.1*
-
-%files python
-%{_libdir}/python*/site-packages/*
+%files -n perl-rrdtool
+%defattr(-, root, root, 0755)
+%doc examples/
+%doc %{_mandir}/man3/RRDp.3*
+%doc %{_mandir}/man3/RRDs.3*
+%{perl_vendorlib}/RRDp.pm
+%{perl_vendorarch}/RRDs.pm
+%{perl_vendorarch}/auto/RRDs/
+%exclude %{_prefix}/examples/
+
+%if %{!?_without_python:1}0
+%files -n python-rrdtool
+%defattr(-, root, root, 0755)
+%{python_sitearch}/rrdtoolmodule.so
+%endif
 
 %changelog
-* Wed May 11 2005 Alan Milligan <alan.milligan@last-bastion.net> 
-- python support
-* 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
+* Sat Jun 04 2005 Dag Wieers <dag@wieers.com> - 1.2.9-1 - 3221+/dag
+- Updated to release 1.2.9.
+
+* Wed May 18 2005 Dag Wieers <dag@wieers.com> - 1.2.8-1
+- Updated to release 1.2.8.
+
+* Tue May 10 2005 Dag Wieers <dag@wieers.com> - 1.2.6-1
+- Updated to release 1.2.6.
+
+* Sat May 07 2005 Dag Wieers <dag@wieers.com> - 1.2.2-1
+- Updated to release 1.2.2.
+
+* Sat May 07 2005 Dag Wieers <dag@wieers.com> - 1.2.1-1
+- Updated to release 1.2.1.
+
+* Fri Apr 29 2005 Dag Wieers <dag@wieers.com> - 1.2.0-1
+- Updated to release 1.2.0.
+
+* Mon Apr 04 2005 Dag Wieers <dag@wieers.com> - 1.0.49-2
+- Fix for the php-rrdtool patch. (Joe Pruett)
+
+* Thu Aug 25 2004 Dag Wieers <dag@wieers.com> - 1.0.49-1
+- Updated to release 1.0.49.
+
+* Wed Aug 25 2004 Dag Wieers <dag@wieers.com> - 1.0.48-3
+- Fixes for x86_64. (Garrick Staples)
+
+* Fri Jul  2 2004 Matthias Saou <http://freshrpms.net/> 1.0.48-3
+- Actually apply the patch for fixing the php module, doh!
+
+* Thu May 27 2004 Matthias Saou <http://freshrpms.net/> 1.0.48-2
+- Added php.d config entry to load the module once installed.
+
+* Thu May 13 2004 Dag Wieers <dag@wieers.com> - 1.0.48-1
+- Updated to release 1.0.48.
+
+* Tue Apr 06 2004 Dag Wieers <dag@wieers.com> - 1.0.47-1
+- Updated to release 1.0.47.
+
+* Thu Mar  4 2004 Matthias Saou <http://freshrpms.net/> 1.0.46-2
+- Change the strict dependency on perl to fix problem with the recent
+  update.
+
+* Mon Jan  5 2004 Matthias Saou <http://freshrpms.net/> 1.0.46-1
+- Update to 1.0.46.
+- Use system libpng and zlib instead of bundled ones.
+- Added php-rrdtool sub-package for the php4 module.
+
+* Fri Dec  5 2003 Matthias Saou <http://freshrpms.net/> 1.0.45-4
+- Added epoch to the perl dependency to work with rpm > 4.2.
+- Fixed the %% escaping in the perl dep.
+
+* Mon Nov 17 2003 Matthias Saou <http://freshrpms.net/> 1.0.45-2
+- Rebuild for Fedora Core 1.
+
+* Sun Aug  3 2003 Matthias Saou <http://freshrpms.net/>
+- Update to 1.0.45.
+
+* Wed Apr 16 2003 Matthias Saou <http://freshrpms.net/>
+- Update to 1.0.42.
+
+* Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
+- Rebuilt for Red Hat Linux 9.
+
+* Wed Mar  5 2003 Matthias Saou <http://freshrpms.net/>
+- Added explicit perl version dependency.
+
+* Sun Feb 23 2003 Matthias Saou <http://freshrpms.net/>
+- Update to 1.0.41.
+
+* Fri Jan 31 2003 Matthias Saou <http://freshrpms.net/>
+- Update to 1.0.40.
+- Spec file cleanup.
+
+* Fri Jul 05 2002 Henri Gomez <hgomez@users.sourceforge.net>
+- 1.0.39
+
+* Mon Jun 03 2002 Henri Gomez <hgomez@users.sourceforge.net>
+- 1.0.38
+
+* Fri Apr 19 2002 Henri Gomez <hgomez@users.sourceforge.net>
+- 1.0.37
+
+* Tue Mar 12 2002 Henri Gomez <hgomez@users.sourceforge.net>
+- 1.0.34
+- rrdtools include zlib 1.1.4 which fix vulnerabilities in 1.1.3
+