From 214957f8ca2c9fd5f3dd792b7175eb7e8bb1ef83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 24 May 2013 11:27:14 +0200
Subject: [PATCH] New version

  Resolves: rhbz#966639
- Updated and defuzzified patches
---
 rrdtool-1.4.7-autoconf-fix.patch | 11 ++++++-----
 rrdtool-1.4.7-lua-5.2.patch      | 16 +++++++++-------
 rrdtool.spec                     |  9 +++++++--
 sources                          |  3 +--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/rrdtool-1.4.7-autoconf-fix.patch b/rrdtool-1.4.7-autoconf-fix.patch
index 5e3c98a..583f9d3 100644
--- a/rrdtool-1.4.7-autoconf-fix.patch
+++ b/rrdtool-1.4.7-autoconf-fix.patch
@@ -1,7 +1,8 @@
 diff --git a/configure.ac b/configure.ac
---- ./configure.ac.o	2012-01-24 11:08:48.000000000 +0100
-+++ ./configure.ac	2013-03-26 20:34:06.722121427 +0100
-@@ -782,7 +782,7 @@
+index 059ca8b..2ff18a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -772,7 +772,7 @@ LUA_EOF
            done
          fi
  
@@ -18,8 +19,8 @@ index c0e8b0f..265191d 100644
  tclpkg_DATA = pkgIndex.tcl
  tclpkg_SCRIPTS = ifOctets.tcl
  else
--pkglib_DATA = pkgIndex.tcl
--pkglib_SCRIPTS = ifOctets.tcl
+-pkgdata_DATA = pkgIndex.tcl
+-pkgdata_SCRIPTS = ifOctets.tcl
 +pkgindexdir = $(pkglibdir)
 +pkgindex_DATA = pkgIndex.tcl
 +pkgindex_SCRIPTS = ifOctets.tcl
diff --git a/rrdtool-1.4.7-lua-5.2.patch b/rrdtool-1.4.7-lua-5.2.patch
index 03c08f4..f597371 100644
--- a/rrdtool-1.4.7-lua-5.2.patch
+++ b/rrdtool-1.4.7-lua-5.2.patch
@@ -1,6 +1,7 @@
-diff -up rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52 rrdtool-1.4.7/bindings/lua/rrdlua.c
---- rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52	2013-05-15 11:38:28.152336459 -0400
-+++ rrdtool-1.4.7/bindings/lua/rrdlua.c	2013-05-15 11:38:48.291336762 -0400
+diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
+index 690ba29..839833a 100644
+--- a/bindings/lua/rrdlua.c
++++ b/bindings/lua/rrdlua.c
 @@ -342,7 +342,7 @@ set_info (lua_State * L)
  
  /**********************************************************/
@@ -10,10 +11,11 @@ diff -up rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52 rrdtool-1.4.7/bindings/lua/r
    {"create", lua_rrd_create},
    {"dump", lua_rrd_dump},
    {"fetch", lua_rrd_fetch},
-diff -up rrdtool-1.4.7/configure.ac.lua-52 rrdtool-1.4.7/configure.ac
---- rrdtool-1.4.7/configure.ac.lua-52	2013-05-15 11:35:49.074334072 -0400
-+++ rrdtool-1.4.7/configure.ac	2013-05-15 11:35:49.077334073 -0400
-@@ -744,7 +744,12 @@ LUA_EOF
+diff --git a/configure.ac b/configure.ac
+index 2ff18a8..4993717 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -734,7 +734,12 @@ LUA_EOF
        LIBS=
        lua_havelib=no
        LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
diff --git a/rrdtool.spec b/rrdtool.spec
index b1b4541..0092b9c 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -17,8 +17,8 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.4.7
-Release: 17%{?dist}
+Version: 1.4.8
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Databases
 URL: http://oss.oetiker.ch/rrdtool/
@@ -386,6 +386,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
 %endif
 
 %changelog
+* Thu May 23 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.8-1
+- New version
+  Resolves: rhbz#966639
+- Updated and defuzzified patches
+
 * Mon May 20 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-17
 - Require lua abi instead of package version
 
diff --git a/sources b/sources
index 064f453..b12ebb0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ffe369d8921b4dfdeaaf43812100c38f  rrdtool-1.4.7.tar.gz
-28074a9c368af013462631959ab90558  php4-r1190.tar.gz
+dbe59386db97fd2f2216729facd74ca8  rrdtool-1.4.8.tar.gz