- Update to rrdtool 1.3 beta1

rrdtool.spec

@@ -3,20 +3,20 @@
 %define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
 %define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-%define svnrev r1144
+%define svnrev r1190
+%define betaver beta1
+%define pretag 1.2.99907080300
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.2.999
-Release: 0.3.%{svnrev}%{?dist}
+Version: 1.3
+Release: 0.1.%{betaver}%{?dist}
 License: GPL
 Group: Applications/Databases
 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
+Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{betaver}.tar.gz
 Source1: php4-%{svnrev}.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, cairo-devel, pango-devel
@@ -138,16 +138,7 @@ The %{name}-ruby package includes RRDtool bindings for Ruby.
 %endif
 
 %prep
-%setup -q
-# 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
-%endif
-
+%setup -q -n %{name}-%{pretag} %{?with_php: -a 1}
 
 # 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' \
@@ -252,11 +243,10 @@ __EOF__
 find examples/ -type f -exec chmod 0644 {} \;
 
 # Clean up the buildroot
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/{txt,html}/ \
+%{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-* \
 	$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
@@ -322,6 +312,9 @@ find examples/ -type f -exec chmod 0644 {} \;
 %endif
 
 %changelog
+* Wed Aug 08 2007 Jarod Wilson <jwilson@redhat.com> 1.3-0.1.beta1
+- Update to rrdtool 1.3 beta1
+
 * Tue Jul 10 2007 Jarod Wilson <jwilson@redhat.com> 1.2.999-0.3.r1144
 - Update to latest rrdtool pre-1.3 svn snapshot (svn r1144)
 - Add php abi check (Resolves: #247339)