From d437e8abece9224e67e10855fda9e7797d0b4551 Mon Sep 17 00:00:00 2001 From: Chris Ricker Date: Thu, 20 Apr 2006 21:01:23 +0000 Subject: [PATCH] update to 1.2 --- .cvsignore | 1 - rrdtool.spec | 101 ++++++++++++++------------------------------------- sources | 1 - 3 files changed, 27 insertions(+), 76 deletions(-) diff --git a/.cvsignore b/.cvsignore index b428b79..e69de29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +0,0 @@ -rrdtool-1.0.49.tar.gz diff --git a/rrdtool.spec b/rrdtool.spec index 750dbb0..557198c 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,18 +1,17 @@ -%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) - Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.0.49 -Release: 5%{?dist} +Version: 1.2.12 +Release: 1%{?dist} License: GPL Group: Applications/Databases URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz -Patch0: rrdtool-1.0.49-php_config.patch -Patch1: rrdtool-1.0.49-fc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel -BuildRequires: libpng-devel, zlib-devel +BuildRequires: gcc-c++ openssl-devel +BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel +BuildRequires: freetype-devel, python-devel + +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -23,7 +22,6 @@ 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: RRDtool static libraries and header files Group: Development/Libraries @@ -34,46 +32,22 @@ 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 -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 -%patch0 -p0 -b .phpfix -%patch1 -p1 -b .fc4 # Fixes to /usr/lib(64) for x86_64 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \ - configure contrib/php4/configure Makefile.in - + configure Makefile.in %build %configure \ --program-prefix="%{?_program_prefix}" \ --enable-shared \ - --enable-local-libpng \ - --enable-local-zlib \ - --with-pic + --with-pic \ + --enable-perl-site-install \ + --with-perl-options='INSTALLDIRS="vendor"' %{__make} %{?_smp_mflags} -# Build the php4 module, the tmp install is required -%define rrdtmpdir %{_tmppath}/%{buildsubdir}-tmpinstall -%{__make} install DESTDIR="%{rrdtmpdir}" -pushd contrib/php4 - ./configure \ - --with-rrdtool="%{rrdtmpdir}%{_prefix}" - %{__make} %{?_smp_mflags} -popd -%{__rm} -rf %{rrdtmpdir} - # Fix @perl@ and @PERL@ find examples/ -type f \ -exec %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \; @@ -82,73 +56,52 @@ find examples/ -name "*.pl" \ %install -%{__rm} -rf %{buildroot} -%makeinstall - -# Install the php4 module -%{__install} -D -m0755 contrib/php4/modules/rrdtool.so \ - %{buildroot}%{php_extdir}/rrdtool.so -# Clean up the examples for inclusion as docs -%{__rm} -rf contrib/php4/examples/CVS -# Put the php config bit into place -%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d -%{__cat} > %{buildroot}%{_sysconfdir}/php.d/rrdtool.ini << EOF -; Enable rrdtool extension module -extension=rrdtool.so -EOF - -# Put perl files back where they belong -%{__mkdir_p} %{buildroot}%{perl_vendorarch}/ -%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/ +rm -rf $RPM_BUILD_ROOT +make DESTDIR="$RPM_BUILD_ROOT" install # We only want .txt and .html files for the main documentation %{__mkdir_p} doc2/doc %{__cp} -a doc/*.txt doc/*.html doc2/doc/ # Clean up the examples and contrib -%{__rm} -f examples/Makefile* -%{__rm} -f contrib/Makefile* +%{__rm} -f examples/Makefile* examples/*.in + # This is so rpm doesn't pick up perl module dependencies automatically -find examples/ contrib/ -type f -exec chmod 0644 {} \; +find examples/ -type f -exec chmod 0644 {} \; # Clean up the buildroot -%{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/ - +%{__rm} -rf %{buildroot}%{_prefix}/{doc,examples,html}/ \ + %{buildroot}%{perl_vendorarch}/ntmake.pl \ + %{buildroot}%{perl_archlib}/perllocal.pod \ %clean %{__rm} -rf %{buildroot} - %files %defattr(-, root, root, 0755) -%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc +%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS doc2/doc %{_bindir}/* %{_libdir}/*.so.* +%{_datadir}/rrdtool/ +%{perl_vendorlib}/*.pm %{perl_vendorarch}/*.pm %{perl_vendorarch}/auto/* +%{python_sitelib}/rrdtoolmodule.so %{_mandir}/man1/* - +%{_mandir}/man3/* %files devel %defattr(-, root, root, 0755) %doc examples/ -%doc contrib/add_ds contrib/killspike contrib/log2rrd contrib/rrdexplorer -%doc contrib/rrdfetchnames contrib/rrd-file-icon contrib/rrdlastds -%doc contrib/rrdproc contrib/rrdview contrib/snmpstats contrib/trytime %{_includedir}/*.h %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so - -%files -n php-rrdtool -%defattr(-, root, root) -%doc contrib/php4/examples contrib/php4/README -%config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini -%{php_extdir}/rrdtool.so - - %changelog +* Wed Apr 19 2006 Chris Ricker 1.2.12-1 +- Rev to 1.2 + * Fri May 20 2005 Matthias Saou 1.0.49-5 - Include patch from Michael to fix perl module compilation on FC4 (#156242). diff --git a/sources b/sources index 4c31edd..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -fbe492dbf3d68abb1d86c2322e7ed44a rrdtool-1.0.49.tar.gz