Bump rawhide rrdtool to pre-1.3 svn snap
This commit is contained in:
Jarod Wilson
parent
33e440eb88
commit
2714d4454b
|
|
@ -8,3 +8,5 @@ rrdtool-1.2.19.tar.gz
|
|||
rrdtool-1.2.21.tar.gz
|
||||
rrdtool-1.2.22.tar.gz
|
||||
rrdtool-1.2.23.tar.gz
|
||||
rrdtool-1.2.999-r1127.tar.gz
|
||||
php4-r1127.tar.gz
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ diff -Naur php4-orig/rrdtool.c php4/rrdtool.c
|
|||
+#include <rrd.h>
|
||||
+
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+#include "../config.h"
|
||||
+#include "../php_config.h"
|
||||
+#endif
|
||||
|
||||
#if HAVE_RRDTOOL
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
44
rrdtool.spec
44
rrdtool.spec
|
|
@ -2,22 +2,26 @@
|
|||
%define with_php %{?_without_php: 0} %{?!_without_php: 1}
|
||||
%define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
|
||||
%define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
|
||||
%define php_rrd_svn 839
|
||||
%define php_rrd_svn r1127
|
||||
%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
|
||||
%define svnrev r1127
|
||||
|
||||
Summary: Round Robin Database Tool to store and display time-series data
|
||||
Name: rrdtool
|
||||
Version: 1.2.23
|
||||
Release: 5%{?dist}
|
||||
Version: 1.2.999
|
||||
Release: 0.1.%{svnrev}%{?dist}
|
||||
License: GPL
|
||||
Group: Applications/Databases
|
||||
URL: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/
|
||||
Source0: http://people.ee.ethz.ch/~oetiker/webtools/%{name}/pub/%{name}-%{version}.tar.gz
|
||||
Source1: php4-svn%{php_rrd_svn}.tar.gz
|
||||
Patch0: rrdtool-1.2.13-php.patch
|
||||
URL: http://oss.oetiker.ch/rrdtool/
|
||||
# svn checkout svn://svn.oetiker.ch/rrdtool/trunk/program
|
||||
Source0: %{name}-%{version}-%{svnrev}.tar.gz
|
||||
#Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
|
||||
Source1: php4-%{php_rrd_svn}.tar.gz
|
||||
Patch0: rrdtool-1.2.999-php.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gcc-c++, openssl-devel, freetype-devel
|
||||
BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel >= 2.0
|
||||
BuildRequires: libpng-devel, zlib-devel, cairo-devel
|
||||
BuildRequires: perl-ExtUtils-MakeMaker
|
||||
%if "%{?fedora}" >= "7"
|
||||
BuildRequires: perl-devel
|
||||
%endif
|
||||
|
|
@ -129,19 +133,22 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -T -D -a 1
|
||||
# for svn checkouts (calls libtool/automake/autoconf)
|
||||
./MakeMakefile
|
||||
|
||||
# Patch based on http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.tgz
|
||||
%if %{with_php}
|
||||
%setup -q -T -D -a 1
|
||||
%patch0 -p0 -b .php
|
||||
%{__perl} -pi -e 's|../config.h|../rrd_config.h|g' php4/rrdtool.c
|
||||
%endif
|
||||
|
||||
|
||||
# Fix to find correct python dir on lib64
|
||||
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
||||
configure
|
||||
|
||||
# Most edits shouldn't be necessary when using --libdir, but
|
||||
# w/o, some introduce hardcoded rpaths where they shouldn't,
|
||||
# w/o, some introduce hardcoded rpaths where they shouldn't
|
||||
%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
|
||||
configure Makefile.in php4/configure php4/ltconfig*
|
||||
|
||||
|
|
@ -176,7 +183,8 @@ pushd bindings/perl-piped/
|
|||
%{__perl} -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile
|
||||
popd
|
||||
|
||||
%{__make} %{?_smp_mflags}
|
||||
#{__make} %{?_smp_mflags}
|
||||
make
|
||||
|
||||
# Build the php module, the tmp install is required
|
||||
%if %{with_php}
|
||||
|
|
@ -186,7 +194,8 @@ pushd php4/
|
|||
%configure \
|
||||
--with-rrdtool="%{rrdtmp}%{_prefix}" \
|
||||
--disable-static
|
||||
%{__make} %{?_smp_mflags}
|
||||
#{__make} %{?_smp_mflags}
|
||||
make
|
||||
popd
|
||||
%{__rm} -rf %{rrdtmp}
|
||||
%endif
|
||||
|
|
@ -218,6 +227,9 @@ __EOF__
|
|||
# Pesky RRDp.pm...
|
||||
%{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
|
||||
|
||||
# Dunno why this is getting installed here...
|
||||
%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/../leaktest.pl
|
||||
|
||||
# We only want .txt and .html files for the main documentation
|
||||
%{__mkdir_p} doc2/html doc2/txt
|
||||
%{__cp} -a doc/*.txt doc2/txt/
|
||||
|
|
@ -238,6 +250,7 @@ find examples/ -type f -exec chmod 0644 {} \;
|
|||
$RPM_BUILD_ROOT%{perl_vendorarch}/ntmake.pl \
|
||||
$RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \
|
||||
$RPM_BUILD_ROOT%{_datadir}/%{name}/examples \
|
||||
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}* \
|
||||
$RPM_BUILD_ROOT%{perl_vendorarch}/auto/*/{.packlist,*.bs}
|
||||
|
||||
%clean
|
||||
|
|
@ -262,7 +275,7 @@ find examples/ -type f -exec chmod 0644 {} \;
|
|||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS
|
||||
%doc CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS
|
||||
%doc examples doc2/html doc2/txt
|
||||
|
||||
%files perl
|
||||
|
|
@ -303,6 +316,9 @@ find examples/ -type f -exec chmod 0644 {} \;
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jun 15 2007 Jarod Wilson <jwilson@redhat.com> 1.2.999-0.1.r1127
|
||||
- Update to rrdtool pre-1.3 svn snapshot (svn r1127)
|
||||
|
||||
* Mon May 21 2007 Jarod Wilson <jwilson@redhat.com> 1.2.23-5
|
||||
- BR: ruby so %%ruby_sitearch gets set
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue