From 0559b7ce77327128e58665c09f3507da4ecd5b8f Mon Sep 17 00:00:00 2001 From: cvsextras Date: Tue, 9 Nov 2004 02:50:26 +0000 Subject: [PATCH] auto-import changelog data from rrdtool-1.0.49-1.1.fc1.fr.src.rpm Wed Aug 25 2004 Dag Wieers - 1.0.49-1 - Updated to release 1.0.49. Wed Aug 25 2004 Dag Wieers - 1.0.48-3 - Fixes for x86_64. (Garrick Staples) //freshrpms.net/> 1.0.48-3 - Actually apply the patch for fixing the php module, doh! //freshrpms.net/> 1.0.48-2 - Added php.d config entry to load the module once installed. Thu May 13 2004 Dag Wieers - 1.0.48-1 - Updated to release 1.0.48. Tue Apr 06 2004 Dag Wieers - 1.0.47-1 - Updated to release 1.0.47. //freshrpms.net/> 1.0.46-2 - Change the strict dependency on perl to fix problem with the recent update. //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. //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. //freshrpms.net/> 1.0.45-2 - Rebuild for Fedora Core 1. //freshrpms.net/> - Update to 1.0.45. --- .cvsignore | 2 +- rrdtool-1.0.48-php_config.patch | 11 ++ rrdtool.spec | 175 +++++++++++++++++++++++++------- sources | 2 +- 4 files changed, 151 insertions(+), 39 deletions(-) create mode 100644 rrdtool-1.0.48-php_config.patch diff --git a/.cvsignore b/.cvsignore index 1f601cb..b428b79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rrdtool-1.0.45.tar.gz +rrdtool-1.0.49.tar.gz diff --git a/rrdtool-1.0.48-php_config.patch b/rrdtool-1.0.48-php_config.patch new file mode 100644 index 0000000..14b7908 --- /dev/null +++ b/rrdtool-1.0.48-php_config.patch @@ -0,0 +1,11 @@ +--- contrib/php4/php_rrdtool.h.orig 2003-06-30 10:46:50.000000000 +0200 ++++ contrib/php4/php_rrdtool.h 2004-08-25 20:15:28.172799056 +0200 +@@ -12,6 +12,8 @@ + #ifndef _PHP4_RRDTOOL_H + #define _PHP4_RRDTOOL_H + ++#include "php_config.h" ++ + #if COMPILE_DL_RRDTOOL + #undef HAVE_RRDTOOL + #define HAVE_RRDTOOL 1 diff --git a/rrdtool.spec b/rrdtool.spec index 1bd24c9..52a5735 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,16 +1,25 @@ -# $Id: rrdtool.spec,v 1.2 2004/11/09 02:50:20 cvsextras Exp $ +# $Id: rrdtool.spec,v 1.3 2004/11/09 02:50:26 cvsextras Exp $ +# Authority: matthias +# Upstream: Tobi Oetiker -Summary: Round Robin Database Tool to store and display time-series data. +%define phpextdir %(php-config --extension-dir) + +Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.0.45 -Release: 1.fr +Version: 1.0.49 +Release: 1.1.fc1.fr License: GPL Group: Applications/Databases -Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/%{name}-%{version}.tar.gz URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/ -BuildRoot: %{_tmppath}/%{name}-root -Requires: perl = %(rpm -q --qf '%%{version}' perl) -BuildRequires: perl + +Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz +Patch: rrdtool-1.0.48-php_config.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +BuildRequires: gcc-c++, perl, php-devel >= 4.0, openssl-devel +BuildRequires: libpng-devel, zlib-devel +Requires: perl >= %(rpm -q --qf '%%{epoch}:%%{version}' perl) +Requires: libpng, zlib %description RRD is the Acronym for Round Robin Database. RRD is a system to store and @@ -23,7 +32,7 @@ put a friendly user interface on it. %package devel -Summary: RRDtool static libraries and header files. +Summary: RRDtool static libraries and header files Group: Development/Libraries Requires: %{name} = %{version} @@ -33,79 +42,171 @@ 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 -q +%setup +%patch -b .phpfix + +### FIXME: Fixes to /usr/lib(64) for x86_64 +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure contrib/php4/configure Makefile.in %build -%configure --enable-shared -make +%configure \ + --program-prefix="%{?_program_prefix}" \ + --enable-shared \ + --enable-local-libpng \ + --enable-local-zlib \ + --with-pic +%{__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 /usr/bin/perl -pi -e 's|^#! \@perl\@|#!/usr/bin/perl|gi' \{\} \; + -exec %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \; find examples/ -name "*.pl" \ - -exec perl -pi -e 's|\015||gi' \{\} \; + -exec %{__perl} -pi -e 's|\015||gi' {} \; + %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%{__rm} -rf %{buildroot} +%makeinstall + +# Install the php4 module +%{__install} -D -m0755 contrib/php4/modules/rrdtool.so \ + %{buildroot}%{phpextdir}/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_sitearch}/ -mv %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_sitearch}/ +%{__mkdir_p} %{buildroot}%{perl_sitearch}/ +%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_sitearch}/ # We only want .txt and .html files for the main documentation -mkdir -p doc2/doc -cp -a doc/*.txt doc/*.html doc2/doc/ +%{__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* +%{__rm} -f contrib/Makefile* +# This is so rpm doesn't pick up perl module dependencies automatically +find examples/ contrib/ -type f -exec chmod 0644 {} \; # Put man pages back into place... -mkdir -p %{buildroot}%{_mandir}/ -mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/ +#%{__mkdir_p} %{buildroot}%{_mandir}/ +#%{__mv} %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/ # Clean up the buildroot -rm -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html} +%{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/ + %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %files -%defattr(-, root, root) -%doc CHANGES CONTRIBUTORS COPYING README TODO doc2/doc +%defattr(-, root, root, 0755) +%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc %{_bindir}/* %{_libdir}/*.so.* %{perl_sitearch}/*.pm %{perl_sitearch}/auto/* %{_mandir}/man1/* + %files devel -%defattr(-, root, root) -%doc contrib examples -%{_includedir}/* +%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 +%{phpextdir}/rrdtool.so + + %changelog -* Sun Aug 3 2003 Matthias Saou +* Thu Aug 25 2004 Dag Wieers - 1.0.49-1 +- Updated to release 1.0.49. + +* Wed Aug 25 2004 Dag Wieers - 1.0.48-3 +- Fixes for x86_64. (Garrick Staples) + +* Fri Jul 2 2004 Matthias Saou 1.0.48-3 +- Actually apply the patch for fixing the php module, doh! + +* Thu May 27 2004 Matthias Saou 1.0.48-2 +- Added php.d config entry to load the module once installed. + +* Thu May 13 2004 Dag Wieers - 1.0.48-1 +- Updated to release 1.0.48. + +* Tue Apr 06 2004 Dag Wieers - 1.0.47-1 +- Updated to release 1.0.47. + +* Thu Mar 4 2004 Matthias Saou 1.0.46-2 +- Change the strict dependency on perl to fix problem with the recent + update. + +* Mon Jan 5 2004 Matthias Saou 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 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 1.0.45-2 +- Rebuild for Fedora Core 1. + +* Sun Aug 3 2003 Matthias Saou - Update to 1.0.45. -* Wed Apr 16 2003 Matthias Saou +* Wed Apr 16 2003 Matthias Saou - Update to 1.0.42. -* Mon Mar 31 2003 Matthias Saou +* Mon Mar 31 2003 Matthias Saou - Rebuilt for Red Hat Linux 9. -* Wed Mar 5 2003 Matthias Saou +* Wed Mar 5 2003 Matthias Saou - Added explicit perl version dependency. -* Sun Feb 23 2003 Matthias Saou +* Sun Feb 23 2003 Matthias Saou - Update to 1.0.41. -* Fri Jan 31 2003 Matthias Saou +* Fri Jan 31 2003 Matthias Saou - Update to 1.0.40. - Spec file cleanup. diff --git a/sources b/sources index b7959a5..4c31edd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64086fc7f1ca28c069ee5104f85d7a8c rrdtool-1.0.45.tar.gz +fbe492dbf3d68abb1d86c2322e7ed44a rrdtool-1.0.49.tar.gz