From 0de2de7f90958a5e43da4d18cf18e7ff9ff023ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 26 Jan 2012 10:39:14 +0100 Subject: [PATCH] New version Resolves: rhbz#783553 - Dropped fix-tcl-site-option patch (upstreamed) --- .gitignore | 9 +-------- rrdtool-1.4.4-fix-tcl-site-option.patch | 23 ----------------------- rrdtool.spec | 12 +++++++----- sources | 3 +-- 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 rrdtool-1.4.4-fix-tcl-site-option.patch diff --git a/.gitignore b/.gitignore index ea9efa5..8e25fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ php4-r1190.tar.gz -rrdtool-1.3.3.tar.gz -rrdtool-1.3.4.tar.gz -rrdtool-1.3.5.tar.gz -rrdtool-1.3.6.tar.gz -rrdtool-1.3.7.tar.gz -rrdtool-1.3.8.tar.gz -/rrdtool-1.4.4.tar.gz -/php4-r1190.tar.gz +rrdtool-*.tar.gz diff --git a/rrdtool-1.4.4-fix-tcl-site-option.patch b/rrdtool-1.4.4-fix-tcl-site-option.patch deleted file mode 100644 index 8f38a0e..0000000 --- a/rrdtool-1.4.4-fix-tcl-site-option.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- rrdtool-1.4.4/configure.old 2010-11-23 14:39:42.000000000 +0100 -+++ rrdtool-1.4.4/configure 2010-11-23 14:40:32.656140783 +0100 -@@ -1036,6 +1036,7 @@ - enable_lua_site_install - enable_tcl - with_tcllib -+enable_tcl_site - enable_python - ' - ac_precious_vars='build_alias -@@ -28584,9 +28585,9 @@ - TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR" - fi - fi -- # Check whether --enable-tcl was given. --if test "${enable_tcl+set}" = set; then -- enableval=$enable_tcl; -+ # Check whether --enable-tcl-site was given. -+if test "${enable_tcl_site+set}" = set; then -+ enableval=$enable_tcl_site; - else - enable_tcl_site=yes - fi diff --git a/rrdtool.spec b/rrdtool.spec index 5ac6a21..3c4a5f8 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -17,15 +17,13 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.4.4 -Release: 9%{?dist} +Version: 1.4.7 +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 Source1: php4-%{svnrev}.tar.gz -# Fix tcl-site configure option (upstream ticket #281) -Patch0: rrdtool-1.4.4-fix-tcl-site-option.patch Patch1: rrdtool-1.4.4-php54.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -164,7 +162,6 @@ The %{name}-lua package includes RRDtool bindings for Lua. %prep %setup -q -n %{name}-%{version} %{?with_php: -a 1} -%patch0 -p1 -b .fix-tcl-site-option %if %{with_php} %patch1 -p1 -b .php54 %endif @@ -376,6 +373,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Thu Jan 26 2012 Jaroslav Škarvada - 1.4.7-1 +- New version + Resolves: rhbz#783553 +- Dropped fix-tcl-site-option patch (upstreamed) + * Thu Jan 19 2012 Remi Collet - 1.4.4-9 - build with php 5.4 diff --git a/sources b/sources index 8cb98cf..5ec3acc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -93ad2fc2e9ddcd7d99c611fe30284a54 rrdtool-1.4.4.tar.gz -28074a9c368af013462631959ab90558 php4-r1190.tar.gz +ffe369d8921b4dfdeaaf43812100c38f rrdtool-1.4.7.tar.gz