rpms/rrdtool/F-9 .cvsignore, 1.21, 1.22 rrdtool.spec, 1.61, 1.62 sources, 1.24, 1.25

[Chris Ricker (kaboom)]

Author: kaboom

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

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
Update to latest rc



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	19 May 2008 14:08:18 -0000	1.21
+++ .cvsignore	27 May 2008 16:22:51 -0000	1.22
@@ -1,9 +1,2 @@
-php4-r1127.tar.gz
-rrdtool-1.2.999-r1144.tar.gz
-php4-r1144.tar.gz
 php4-r1190.tar.gz
-rrdtool-1.3beta1.tar.gz
-rrdtool-1.3beta2.tar.gz
-rrdtool-1.3beta3.tar.gz
-rrdtool-1.3beta4.tar.gz
-rrdtool-1.3rc4.tar.gz
+rrdtool-1.3rc6.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/rrdtool.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- rrdtool.spec	20 May 2008 01:54:47 -0000	1.61
+++ rrdtool.spec	27 May 2008 16:22:51 -0000	1.62
@@ -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 rc4
+%define betaver rc6
 %define pretag 1.2.99908020600
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.3
-Release: 0.17.%{betaver}%{?dist}
+Release: 0.18.%{betaver}%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -20,7 +20,7 @@
 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
-Patch4: rrdtool-1.3rc4-fix-python-bindings.patch
+#Patch4: rrdtool-1.3rc4-fix-python-bindings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dejavu-lgc-fonts
 BuildRequires: gcc-c++, openssl-devel, freetype-devel
@@ -146,7 +146,7 @@
 %if %{with_php}
 %patch1 -p1
 %endif
-%patch4 -p1
+#%%patch4 -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' \
@@ -325,13 +325,16 @@
 %endif
 
 %changelog
-* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3.0-0.17.rc4
+* Tue May 27 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.18.rc6
+- Update to 1.3-rc6
+
+* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.17.rc4
 - Patch from upstream for python bindings (bz#435468)
 
-* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3.0-0.16.rc4
+* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.16.rc4
 - Rebuild
 
-* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3.0-0.15.rc4
+* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.15.rc4
 - Update to 1.3-rc4
 - Add additional BuildRequires
 - Drop merged patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	19 May 2008 14:08:18 -0000	1.24
+++ sources	27 May 2008 16:22:51 -0000	1.25
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-d10985db6a3bcd122ad417eca16cf981  rrdtool-1.3rc4.tar.gz
+20ed9e49ce0f9cd60799ff55a93ae271  rrdtool-1.3rc6.tar.gz