New version
Resolves: rhbz#966639 - Updated and defuzzified patches
This commit is contained in:
parent
69e2b300dc
commit
214957f8ca
@ -1,7 +1,8 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
--- ./configure.ac.o 2012-01-24 11:08:48.000000000 +0100
|
index 059ca8b..2ff18a8 100644
|
||||||
+++ ./configure.ac 2013-03-26 20:34:06.722121427 +0100
|
--- a/configure.ac
|
||||||
@@ -782,7 +782,7 @@
|
+++ b/configure.ac
|
||||||
|
@@ -772,7 +772,7 @@ LUA_EOF
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -18,8 +19,8 @@ index c0e8b0f..265191d 100644
|
|||||||
tclpkg_DATA = pkgIndex.tcl
|
tclpkg_DATA = pkgIndex.tcl
|
||||||
tclpkg_SCRIPTS = ifOctets.tcl
|
tclpkg_SCRIPTS = ifOctets.tcl
|
||||||
else
|
else
|
||||||
-pkglib_DATA = pkgIndex.tcl
|
-pkgdata_DATA = pkgIndex.tcl
|
||||||
-pkglib_SCRIPTS = ifOctets.tcl
|
-pkgdata_SCRIPTS = ifOctets.tcl
|
||||||
+pkgindexdir = $(pkglibdir)
|
+pkgindexdir = $(pkglibdir)
|
||||||
+pkgindex_DATA = pkgIndex.tcl
|
+pkgindex_DATA = pkgIndex.tcl
|
||||||
+pkgindex_SCRIPTS = ifOctets.tcl
|
+pkgindex_SCRIPTS = ifOctets.tcl
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
diff -up rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52 rrdtool-1.4.7/bindings/lua/rrdlua.c
|
diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
|
||||||
--- rrdtool-1.4.7/bindings/lua/rrdlua.c.lua-52 2013-05-15 11:38:28.152336459 -0400
|
index 690ba29..839833a 100644
|
||||||
+++ rrdtool-1.4.7/bindings/lua/rrdlua.c 2013-05-15 11:38:48.291336762 -0400
|
--- a/bindings/lua/rrdlua.c
|
||||||
|
+++ b/bindings/lua/rrdlua.c
|
||||||
@@ -342,7 +342,7 @@ set_info (lua_State * L)
|
@@ -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},
|
{"create", lua_rrd_create},
|
||||||
{"dump", lua_rrd_dump},
|
{"dump", lua_rrd_dump},
|
||||||
{"fetch", lua_rrd_fetch},
|
{"fetch", lua_rrd_fetch},
|
||||||
diff -up rrdtool-1.4.7/configure.ac.lua-52 rrdtool-1.4.7/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
--- rrdtool-1.4.7/configure.ac.lua-52 2013-05-15 11:35:49.074334072 -0400
|
index 2ff18a8..4993717 100644
|
||||||
+++ rrdtool-1.4.7/configure.ac 2013-05-15 11:35:49.077334073 -0400
|
--- a/configure.ac
|
||||||
@@ -744,7 +744,12 @@ LUA_EOF
|
+++ b/configure.ac
|
||||||
|
@@ -734,7 +734,12 @@ LUA_EOF
|
||||||
LIBS=
|
LIBS=
|
||||||
lua_havelib=no
|
lua_havelib=no
|
||||||
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
|
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.4.7
|
Version: 1.4.8
|
||||||
Release: 17%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://oss.oetiker.ch/rrdtool/
|
URL: http://oss.oetiker.ch/rrdtool/
|
||||||
@ -386,6 +386,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon May 20 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-17
|
||||||
- Require lua abi instead of package version
|
- Require lua abi instead of package version
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user