rpms/rrdtool/devel .cvsignore, 1.20, 1.21 rrdtool.spec, 1.57, 1.58 sources, 1.23, 1.24
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Tue May 13 13:40:54 UTC 2008
Author: jwilson
Update of /cvs/pkgs/rpms/rrdtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10132
Modified Files:
.cvsignore rrdtool.spec sources
Log Message:
* Tue May 13 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.15.rc1
- Update to rrdtool 1.3 rc1
- Fix versioning in changelog entries, had an extra 0 in there...
- Drop cairo and python patches, they're in 1.3 rc1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 13 Feb 2008 21:09:21 -0000 1.20
+++ .cvsignore 13 May 2008 13:40:11 -0000 1.21
@@ -6,3 +6,4 @@
rrdtool-1.3beta2.tar.gz
rrdtool-1.3beta3.tar.gz
rrdtool-1.3beta4.tar.gz
+rrdtool-1.3rc1.tar.gz
Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/rrdtool.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- rrdtool.spec 1 May 2008 01:56:17 -0000 1.57
+++ rrdtool.spec 13 May 2008 13:40:11 -0000 1.58
@@ -4,22 +4,20 @@
%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 pretag 1.2.99908020600
+%define pre rc1
+#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%{?pre:.%{pre}}%{?dist}
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}%{betaver}.tar.gz
+Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{pre}.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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dejavu-lgc-fonts
BuildRequires: gcc-c++, openssl-devel, freetype-devel
@@ -140,12 +138,10 @@
%endif
%prep
-%setup -q -n %{name}-%{pretag} %{?with_php: -a 1}
+%setup -q -n %{name}-%{version}%{pre} %{?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,45 +320,50 @@
%endif
%changelog
-* Wed Apr 30 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.14.beta4
+* Tue May 13 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.15.rc1
+- Update to rrdtool 1.3 rc1
+- Fix versioning in changelog entries, had an extra 0 in there...
+- Drop cairo and python patches, they're in 1.3 rc1
+
+* Wed Apr 30 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.14.beta4
- Drop some conditional flags, they're not working at the moment...
-* Wed Apr 30 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.13.beta4
+* Wed Apr 30 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.13.beta4
- Fix problem with cairo_save/cairo_restore (#444827)
-* Wed Apr 23 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.12.beta4
+* Wed Apr 23 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.12.beta4
- Fix python bindings rrdtool info implementation (#435468)
-* Tue Apr 08 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.11.beta4
+* Tue Apr 08 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.11.beta4
- Work around apparent version string length issue w/perl 5.10 (#441359)
-* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.10.beta4
+* Sat Apr 05 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.10.beta4
- Fix use of rrd_update in php bindings (#437558)
-* Mon Mar 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.0-0.9.beta4
+* Mon Mar 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-0.9.beta4
- rebuild for new perl (again)
-* Wed Feb 13 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.8.beta4
+* Wed Feb 13 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.8.beta4
- Update to rrdtool 1.3 beta4
-* Tue Feb 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.0-0.7.beta3
+* Tue Feb 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-0.7.beta3
- rebuild for new perl (and fix license tag)
-* Mon Feb 04 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.6.beta3
+* Mon Feb 04 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.6.beta3
- Plug memory leak (#430879)
-* Mon Jan 07 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.5.beta3
+* Mon Jan 07 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.5.beta3
- Fix right-aligned text alignment and scaling (Resolves: #427609)
-* Wed Jan 02 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.4.beta3
+* Wed Jan 02 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.4.beta3
- Add newly built python egg to %%files
-* Wed Jan 02 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.3.beta3
+* Wed Jan 02 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.3.beta3
- Update to rrdtool 1.3 beta3
- Return properly from errors in RRDp.pm (Resolves: #427040)
- Requires: dejavu-lgc-fonts (Resolves: #426935)
-* Thu Dec 06 2007 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.2.beta2
+* Thu Dec 06 2007 Jarod Wilson <jwilson at redhat.com> 1.3-0.2.beta2
- Update to rrdtool 1.3 beta2
* Wed Aug 08 2007 Jarod Wilson <jwilson at redhat.com> 1.3-0.1.beta1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 13 Feb 2008 21:09:21 -0000 1.23
+++ sources 13 May 2008 13:40:11 -0000 1.24
@@ -1,2 +1,2 @@
28074a9c368af013462631959ab90558 php4-r1190.tar.gz
-147e036b5d4869974480bdd67bc2ddec rrdtool-1.3beta4.tar.gz
+b89ce83a6a57a1adc5a6b0081363c502 rrdtool-1.3rc1.tar.gz
More information about the fedora-extras-commits
mailing list