rpms/rrdtool
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import changelog data from rrdtool-1.0.49-1.1.fc1.fr.src.rpm

Browse Source 
Wed 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)
//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 <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.
//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.
This commit is contained in:
cvsextras 2004-11-09 02:50:26 +00:00
parent 7f00db901b
commit 0559b7ce77
4 changed files with 151 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
rrdtool-1.0.45.tar.gz rrdtool-1.0.49.tar.gz

11
rrdtool-1.0.48-php_config.patch Normal file
View File

@ -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

175
rrdtool.spec
View File

@ -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 <oetiker$ee,ethz,ch>
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 Name: rrdtool
Version: 1.0.45 Version: 1.0.49
Release: 1.fr Release: 1.1.fc1.fr
License: GPL License: GPL
Group: Applications/Databases 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/ URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
BuildRoot: %{_tmppath}/%{name}-root
Requires: perl = %(rpm -q --qf '%%{version}' perl) Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
BuildRequires: perl 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 %description
RRD is the Acronym for Round Robin Database. RRD is a system to store and 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 %package devel
Summary: RRDtool static libraries and header files. Summary: RRDtool static libraries and header files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version} 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. 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 %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 %build
%configure --enable-shared %configure \
make --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@ # Fix @perl@ and @PERL@
find examples/ -type f \ 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" \ find examples/ -name "*.pl" \
-exec perl -pi -e 's|\015||gi' \{\} \; -exec %{__perl} -pi -e 's|\015||gi' {} \;
%install %install
rm -rf %{buildroot} %{__rm} -rf %{buildroot}
make install DESTDIR=%{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 # Put perl files back where they belong
mkdir -p %{buildroot}%{perl_sitearch}/ %{__mkdir_p} %{buildroot}%{perl_sitearch}/
mv %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_sitearch}/ %{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_sitearch}/
# We only want .txt and .html files for the main documentation # We only want .txt and .html files for the main documentation
mkdir -p doc2/doc %{__mkdir_p} doc2/doc
cp -a doc/*.txt doc/*.html doc2/doc/ %{__cp} -a doc/*.txt doc/*.html doc2/doc/
# Clean up the examples and contrib # Clean up the examples and contrib
rm -f examples/Makefile* %{__rm} -f examples/Makefile*
rm -f contrib/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... # Put man pages back into place...
mkdir -p %{buildroot}%{_mandir}/ #%{__mkdir_p} %{buildroot}%{_mandir}/
mv %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/ #%{__mv} %{buildroot}%{_prefix}/man/* %{buildroot}%{_mandir}/
# Clean up the buildroot # Clean up the buildroot
rm -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html} %{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/
%clean %clean
rm -rf %{buildroot} %{__rm} -rf %{buildroot}
%files %files
%defattr(-, root, root) %defattr(-, root, root, 0755)
%doc CHANGES CONTRIBUTORS COPYING README TODO doc2/doc %doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc
%{_bindir}/* %{_bindir}/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{perl_sitearch}/*.pm %{perl_sitearch}/*.pm
%{perl_sitearch}/auto/* %{perl_sitearch}/auto/*
%{_mandir}/man1/* %{_mandir}/man1/*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root, 0755)
%doc contrib examples %doc examples/
%{_includedir}/* %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 %{_libdir}/*.a
%exclude %{_libdir}/*.la %exclude %{_libdir}/*.la
%{_libdir}/*.so %{_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 %changelog
* Sun Aug 3 2003 Matthias Saou <matthias.saou@est.une.marmotte.net> * 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. - Update to 1.0.45.
* Wed Apr 16 2003 Matthias Saou <matthias.saou@est.une.marmotte.net> * Wed Apr 16 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.0.42. - Update to 1.0.42.
* Mon Mar 31 2003 Matthias Saou <matthias.saou@est.une.marmotte.net> * Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
- Rebuilt for Red Hat Linux 9. - Rebuilt for Red Hat Linux 9.
* Wed Mar 5 2003 Matthias Saou <matthias.saou@est.une.marmotte.net> * Wed Mar 5 2003 Matthias Saou <http://freshrpms.net/>
- Added explicit perl version dependency. - Added explicit perl version dependency.
* Sun Feb 23 2003 Matthias Saou <matthias.saou@est.une.marmotte.net> * Sun Feb 23 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.0.41. - Update to 1.0.41.
* Fri Jan 31 2003 Matthias Saou <matthias.saou@est.une.marmotte.net> * Fri Jan 31 2003 Matthias Saou <http://freshrpms.net/>
- Update to 1.0.40. - Update to 1.0.40.
- Spec file cleanup. - Spec file cleanup.

2
sources
View File

@ -1 +1 @@
64086fc7f1ca28c069ee5104f85d7a8c rrdtool-1.0.45.tar.gz fbe492dbf3d68abb1d86c2322e7ed44a rrdtool-1.0.49.tar.gz