update to 1.2
This commit is contained in:
parent
51c582c35c
commit
d437e8abec
@ -1 +0,0 @@
|
|||||||
rrdtool-1.0.49.tar.gz
|
|
101
rrdtool.spec
101
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
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.0.49
|
Version: 1.2.12
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
|
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
|
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
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
|
BuildRequires: gcc-c++ openssl-devel
|
||||||
BuildRequires: libpng-devel, zlib-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
|
%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 +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
|
scripts (from shell or Perl) or via frontends that poll network devices and
|
||||||
put a friendly user interface on it.
|
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
|
||||||
@ -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,
|
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
|
%setup
|
||||||
%patch0 -p0 -b .phpfix
|
|
||||||
%patch1 -p1 -b .fc4
|
|
||||||
|
|
||||||
# Fixes to /usr/lib(64) for x86_64
|
# Fixes to /usr/lib(64) for x86_64
|
||||||
%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
|
%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
|
||||||
configure contrib/php4/configure Makefile.in
|
configure Makefile.in
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
--program-prefix="%{?_program_prefix}" \
|
--program-prefix="%{?_program_prefix}" \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--enable-local-libpng \
|
--with-pic \
|
||||||
--enable-local-zlib \
|
--enable-perl-site-install \
|
||||||
--with-pic
|
--with-perl-options='INSTALLDIRS="vendor"'
|
||||||
%{__make} %{?_smp_mflags}
|
%{__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 %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \;
|
-exec %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \;
|
||||||
@ -82,73 +56,52 @@ find examples/ -name "*.pl" \
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{__rm} -rf %{buildroot}
|
rm -rf $RPM_BUILD_ROOT
|
||||||
%makeinstall
|
make DESTDIR="$RPM_BUILD_ROOT" install
|
||||||
|
|
||||||
# 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}/
|
|
||||||
|
|
||||||
# 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* examples/*.in
|
||||||
%{__rm} -f contrib/Makefile*
|
|
||||||
# This is so rpm doesn't pick up perl module dependencies automatically
|
# 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
|
# 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
|
%clean
|
||||||
%{__rm} -rf %{buildroot}
|
%{__rm} -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root, 0755)
|
%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}/*
|
%{_bindir}/*
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
|
%{_datadir}/rrdtool/
|
||||||
|
%{perl_vendorlib}/*.pm
|
||||||
%{perl_vendorarch}/*.pm
|
%{perl_vendorarch}/*.pm
|
||||||
%{perl_vendorarch}/auto/*
|
%{perl_vendorarch}/auto/*
|
||||||
|
%{python_sitelib}/rrdtoolmodule.so
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-, root, root, 0755)
|
%defattr(-, root, root, 0755)
|
||||||
%doc examples/
|
%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
|
%{_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
|
|
||||||
%{php_extdir}/rrdtool.so
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 19 2006 Chris Ricker <kaboom@oobleck.net> 1.2.12-1
|
||||||
|
- Rev to 1.2
|
||||||
|
|
||||||
* Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-5
|
* Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-5
|
||||||
- Include patch from Michael to fix perl module compilation on FC4 (#156242).
|
- Include patch from Michael to fix perl module compilation on FC4 (#156242).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user