diff --git a/rrdtool.spec b/rrdtool.spec
index 36f663802cc98fcfdb4f3289591d81bcd751f9ea..390b53162ea0403afd21a7a7cf4ed4f4cb1e9d28 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
-Version: 1.3
-Release: 0.20%{?pre:.%{pre}}%{?dist}
+Version: 1.3.6
+Release: 1
License: GPLv2+ with exceptions
Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/
#Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
-Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{pre}.tar.gz
+Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}.tar.gz
+%if %{with_php}
Source1: php4-%{svnrev}.tar.gz
Patch1: rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dejavu-lgc-fonts
BuildRequires: gcc-c++, openssl-devel, freetype-devel
%endif
%prep
-%setup -q -n %{name}-%{version}%{pre} %{?with_php: -a 1}
%if %{with_php}
+%setup -q -n %{name}-%{version} -a 1
%patch1 -p1
+%else
+%setup -q -n %{name}-%{version}
%endif
# Fix to find correct python dir on lib64
# Most edits shouldn't be necessary when using --libdir, but
# 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*
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure Makefile.in*
+%if %{with_php}
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' php4/configure php4/ltconfig*
+%endif
# Perl 5.10 seems to not like long version strings, hack around it
%{__perl} -pi.orig -e 's|1.299907080300|1.29990708|' \
#
# fix config files for php4 bindings
# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
+%if %{with_php}
cp -p /usr/lib/rpm/config.{guess,sub} php4/
+%endif
+
%build
%configure \
%{_includedir}/*.h
%exclude %{_libdir}/*.la
%{_libdir}/*.so
+%{_libdir}/pkgconfig/librrd.pc
%files doc
%defattr(-,root,root,-)
%files python
%defattr(-,root,root,-)
%doc bindings/python/AUTHORS bindings/python/COPYING bindings/python/README
-%{python_sitearch}/rrdtoolmodule.so
-%{python_sitearch}/py_rrdtool-*.egg-info
+%{python_sitearch}/*
%endif
%if %{with_php}