jskarvad pushed to rrdtool (master). "New version (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 23 13:48:01 UTC 2015
>From e678e021604d0ee495c8af4a503ad23a2479bc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Thu, 23 Apr 2015 15:47:02 +0200
Subject: New version
Resolves: rhbz#1214750
- Dropped python-fix (upstreamed)
diff --git a/rrdtool-1.5.0-lua-5.2.patch b/rrdtool-1.5.0-lua-5.2.patch
deleted file mode 100644
index 6e2896b..0000000
--- a/rrdtool-1.5.0-lua-5.2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
-index bfbc174..b54f787 100644
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -350,7 +350,7 @@ set_info (lua_State * L)
-
- /**********************************************************/
-
--static const struct luaL_reg rrd[] = {
-+static const struct luaL_Reg rrd[] = {
- {"create", lua_rrd_create},
- {"dump", lua_rrd_dump},
- {"fetch", lua_rrd_fetch},
-diff --git a/configure.ac b/configure.ac
-index 6d277bf..d0d9ea0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -810,7 +810,12 @@ LUA_EOF
- LIBS=
- lua_havelib=no
- LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
-- AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
-+ if test "$lua_vndot" -ge "52"; then
-+ CALL_FUNC=lua_callk
-+ else
-+ CALL_FUNC=lua_call
-+ fi
-+ AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
- [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
- [lua_havelib=LUA$lua_vndot],
- [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
-@@ -853,7 +853,7 @@ LUA_EOF
- done
- fi
-
-- LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
-+ LUA_RRD_LIBDIR="$libdir/lua/$lua_vdot"
- # if lua 5.0 can't find compat-5.1, force installation of
- # compat-5.1.lua together with RRDtool.
- if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then
diff --git a/rrdtool-1.5.0-python-fix.patch b/rrdtool-1.5.0-python-fix.patch
deleted file mode 100644
index 9c02138..0000000
--- a/rrdtool-1.5.0-python-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index bdfee3b..6d34847 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -38,8 +38,8 @@ install-data-local:
- && ( cd ${builddir}/python \
- && env BUILDLIBDIR=${abs_top_builddir}/src/.libs \
- $(PYTHON) ${abs_srcdir}/python/setup.py install \
-- --skip-build --prefix=$(DESTDIR)$(prefix) \
-- --exec-prefix=$(DESTDIR)$(exec_prefix) ) \
-+ --skip-build --root=$(DESTDIR) --prefix=$(prefix) \
-+ --exec-prefix=$(exec_prefix)) \
- || true
-
- # rules for building the ruby module
diff --git a/rrdtool-1.5.1-lua-5.2.patch b/rrdtool-1.5.1-lua-5.2.patch
new file mode 100644
index 0000000..7bbba1e
--- /dev/null
+++ b/rrdtool-1.5.1-lua-5.2.patch
@@ -0,0 +1,31 @@
+diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
+index bfbc174..b54f787 100644
+--- a/bindings/lua/rrdlua.c
++++ b/bindings/lua/rrdlua.c
+@@ -350,7 +350,7 @@ set_info (lua_State * L)
+
+ /**********************************************************/
+
+-static const struct luaL_reg rrd[] = {
++static const struct luaL_Reg rrd[] = {
+ {"create", lua_rrd_create},
+ {"dump", lua_rrd_dump},
+ {"fetch", lua_rrd_fetch},
+diff --git a/configure.ac b/configure.ac
+index 6d277bf..d0d9ea0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -810,7 +810,12 @@ LUA_EOF
+ LIBS=
+ lua_havelib=no
+ LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
+- AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
++ if test "$lua_vndot" -ge "52"; then
++ CALL_FUNC=lua_callk
++ else
++ CALL_FUNC=lua_call
++ fi
++ AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
+ [AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
+ [lua_havelib=LUA$lua_vndot],
+ [AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
diff --git a/rrdtool.spec b/rrdtool.spec
index b77475b..7f9d4d9 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -16,7 +16,7 @@
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
License: GPLv2+ with exceptions
Group: Applications/Databases
@@ -27,11 +27,9 @@ Patch1: rrdtool-1.4.4-php54.patch
# disable logo for php 5.5.
Patch2: rrdtool-1.4.7-php55.patch
Patch3: rrdtool-1.5.0-ruby-2-fix.patch
-Patch4: rrdtool-1.5.0-lua-5.2.patch
+Patch4: rrdtool-1.5.1-lua-5.2.patch
# enable php bindings on ppc
Patch5: rrdtool-1.4.8-php-ppc-fix.patch
-# sent upstream
-Patch6: rrdtool-1.5.0-python-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dejavu-sans-mono-fonts
@@ -177,7 +175,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
%endif
%patch4 -p1 -b .lua-52
%patch5 -p1 -b .php-ppc-fix
-%patch6 -p1 -b .python-fix
# 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' \
@@ -197,9 +194,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
cp -p /usr/lib/rpm/config.{guess,sub} php4/
-# Add missing VERSION (reported upstream)
-echo %{version} > VERSION
-
%build
./bootstrap
%configure \
@@ -333,7 +327,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%files
%defattr(-,root,root,-)
-%doc CONTRIBUTORS COPYRIGHT TODO NEWS CHANGES THREADS
+%doc LICENSE CONTRIBUTORS COPYRIGHT TODO NEWS CHANGES THREADS
%exclude %{_docdir}/examples
%exclude %{_docdir}/doc2/html
%exclude %{_docdir}/doc2/txt
@@ -403,6 +397,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%endif
%changelog
+* Thu Apr 23 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 1.5.1-1
+- New version
+ Resolves: rhbz#1214750
+- Dropped python-fix (upstreamed)
+
* Mon Apr 20 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 1.5.0-1
- New version
Resolves: rhbz#1213035
diff --git a/sources b/sources
index 0ef09b2..d82bdf7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bfdd4347720c67e9e4d8d4e80ba2610d rrdtool-1.5.0.tar.gz
28074a9c368af013462631959ab90558 php4-r1190.tar.gz
+422e82e4c4c7251177ee155a1eb5714b rrdtool-1.5.1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rrdtool.git/commit/?h=master&id=e678e021604d0ee495c8af4a503ad23a2479bc40
More information about the scm-commits
mailing list