rpms/rrdtool/F-9 .cvsignore, 1.23, 1.24 rrdtool.spec, 1.63, 1.64 sources, 1.26, 1.27

Jarod Wilson jwilson at fedoraproject.org
Tue Aug 26 18:38:01 UTC 2008


Author: jwilson

Update of /cvs/pkgs/rpms/rrdtool/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10596

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
* Tue Aug 12 2008 Jarod Wilson <jwilson at redhat.com> 1.3.1-1
- Update to rrdtool 1.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	19 Jun 2008 20:21:40 -0000	1.23
+++ .cvsignore	26 Aug 2008 18:37:31 -0000	1.24
@@ -1,2 +1,3 @@
 php4-r1190.tar.gz
 rrdtool-1.3.0.tar.gz
+rrdtool-1.3.1.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rrdtool/F-9/rrdtool.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- rrdtool.spec	19 Jun 2008 20:21:40 -0000	1.63
+++ rrdtool.spec	26 Aug 2008 18:37:31 -0000	1.64
@@ -4,28 +4,28 @@
 %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 pretag 1.2.99908020600
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.3.0
+Version: 1.3.1
 Release: 1%{?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
 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
-#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
-BuildRequires: libpng-devel, zlib-devel, cairo-devel, pango-devel
+BuildRequires: libpng-devel, zlib-devel, intltool >= 0.35.0
+BuildRequires: cairo-devel >= 1.4.6, pango-devel >= 1.17
 BuildRequires: libtool, groff
 BuildRequires: gettext, libxml2-devel
+%if 0%{?fedora} >= 7
 BuildRequires: perl-ExtUtils-MakeMaker perl-devel
+%endif
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -144,7 +144,6 @@
 %if %{with_php}
 %patch1 -p1
 %endif
-#%%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' \
@@ -159,6 +158,11 @@
 %{__perl} -pi.orig -e 's|1.299907080300|1.29990708|' \
     bindings/perl-shared/RRDs.pm bindings/perl-piped/RRDp.pm
 
+#
+# fix config files for php4 bindings
+# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
+cp -p /usr/lib/rpm/config.{guess,sub} php4/
+
 %build
 %configure \
     --with-perl-options='INSTALLDIRS="vendor"' \
@@ -323,62 +327,76 @@
 %endif
 
 %changelog
-* Thu Jun 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3.0-1
-- Update to 1.3.0
+* Tue Aug 12 2008 Jarod Wilson <jwilson at redhat.com> 1.3.1-1
+- Update to rrdtool 1.3.1
+
+* Mon Jun 16 2008 Chris Ricker <kaboom at oobleck.net> 1.3.0-1
+- Update to rrdtool 1.3.0
+
+* Sun Jun 08 2008 Jarod Wilson <jwilson at redhat.com> 1.3-0.20.rc9
+- Update to rrdtool 1.3 rc9
+- Minor spec tweaks to permit building on older EL
+
+* Wed Jun 04 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.19.rc7
+- Update to rrdtool 1.3 rc7
 
 * Tue May 27 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.18.rc6
-- Update to 1.3-rc6
+- Update to rrdtool 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)
+* Wed May 21 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.17.rc4
+- Bump version and rebuild
 
-* Mon May 19 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.16.rc4
-- Rebuild
+* Wed May 21 2008 Chris Ricker <kaboom at oobleck.net> 1.3-0.16.rc4
+- Fix php bindings compile on x86_64
 
 * 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
+- Update to rrdtool 1.3 rc4
+
+* 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
+- Add Requires: gettext and libxml2-devel for new translations
 
-* Wed Apr 30 2008 Jarod Wilson <jwilson at redhat.com> 1.3.0-0.14.beta4
+* 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/F-9/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	19 Jun 2008 20:21:40 -0000	1.26
+++ sources	26 Aug 2008 18:37:31 -0000	1.27
@@ -1,2 +1,2 @@
 28074a9c368af013462631959ab90558  php4-r1190.tar.gz
-3ea8aa9e733c549fa2c1f8a9bcdf2c8d  rrdtool-1.3.0.tar.gz
+ae0eb2465581574ed6355d378c96a17e  rrdtool-1.3.1.tar.gz




More information about the fedora-extras-commits mailing list