rpms/rrdtool/F-9 rrdtool.spec,1.58,1.59

[Chris Ricker (kaboom)]

Author: kaboom

Update of /cvs/pkgs/rpms/rrdtool/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12066

Modified Files:
	rrdtool.spec 
Log Message:
update to latest rc



Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/rrdtool.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- rrdtool.spec	1 May 2008 02:04:53 -0000	1.58
+++ rrdtool.spec	19 May 2008 14:02:56 -0000	1.59
@@ -4,13 +4,13 @@
 %define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %define svnrev r1190
-%define betaver beta4
+%define betaver rc4
 %define pretag 1.2.99908020600
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.3
-Release: 0.14.%{betaver}%{?dist}
+Release: 0.15.%{betaver}%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -18,13 +18,14 @@
 Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{betaver}.tar.gz
 Source1: php4-%{svnrev}.tar.gz
 Patch1: rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch
-Patch2: rrdtool-1.3beta4-fix-python-bindings-rrdtool-info.patch
-Patch3: rrdtool-1.3beta4-fix-cairo.patch
+#Patch2: rrdtool-1.3beta4-fix-python-bindings-rrdtool-info.patch
+#Patch3: rrdtool-1.3beta4-fix-cairo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
 BuildRequires: libpng-devel, zlib-devel, cairo-devel, pango-devel
 BuildRequires: libtool, groff
+BuildRequires: gettext, libxml2-devel
 BuildRequires: perl-ExtUtils-MakeMaker perl-devel
 
 %description
@@ -140,12 +141,10 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{pretag} %{?with_php: -a 1}
+%setup -q -n %{name}-%{version}%{betaver} %{?with_php: -a 1}
 %if %{with_php}
 %patch1 -p1
 %endif
-%patch2 -p1
-%patch3 -p1
 
 # 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' \
@@ -324,6 +323,11 @@
 %endif
 
 %changelog
+* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3.0-0.15.rc4
+- Update to 1.3-rc4
+- Add additional BuildRequires
+- Drop merged patches
+
 * Wed Apr 30 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.14.beta4
 - Drop some conditional flags, they're not working at the moment...