New version
Resolves: rhbz#1251737 - Defuzzified ruby-2-fix and lua-5.2 patches
This commit is contained in:
parent
ec2c4ecb69
commit
d5e7d7f41b
@ -12,10 +12,10 @@ index bfbc174..b54f787 100644
|
|||||||
{"dump", lua_rrd_dump},
|
{"dump", lua_rrd_dump},
|
||||||
{"fetch", lua_rrd_fetch},
|
{"fetch", lua_rrd_fetch},
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 6d277bf..d0d9ea0 100644
|
index 1a84037..4575f00 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -810,7 +810,12 @@ LUA_EOF
|
@@ -813,7 +813,12 @@ LUA_EOF
|
||||||
LIBS=
|
LIBS=
|
||||||
lua_havelib=no
|
lua_havelib=no
|
||||||
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
|
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
|
@ -1,8 +1,8 @@
|
|||||||
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
|
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
|
||||||
index 76e9144..bdfee3b 100644
|
index 54f5c23..ee85c23 100644
|
||||||
--- a/bindings/Makefile.am
|
--- a/bindings/Makefile.am
|
||||||
+++ b/bindings/Makefile.am
|
+++ b/bindings/Makefile.am
|
||||||
@@ -30,8 +30,9 @@ install-data-local:
|
@@ -35,8 +35,9 @@ install-data-local:
|
||||||
&& $(MAKE) install ) \
|
&& $(MAKE) install ) \
|
||||||
|| true
|
|| true
|
||||||
$(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
|
$(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
|
||||||
@ -14,7 +14,7 @@ index 76e9144..bdfee3b 100644
|
|||||||
|| true
|
|| true
|
||||||
$(AM_V_GEN)test -d ${builddir}/python/build \
|
$(AM_V_GEN)test -d ${builddir}/python/build \
|
||||||
&& ( cd ${builddir}/python \
|
&& ( cd ${builddir}/python \
|
||||||
@@ -52,7 +53,8 @@ ruby:
|
@@ -57,7 +58,8 @@ ruby:
|
||||||
EPREFIX=$(exec_prefix) \
|
EPREFIX=$(exec_prefix) \
|
||||||
ABS_TOP_SRCDIR=${abs_top_srcdir} \
|
ABS_TOP_SRCDIR=${abs_top_srcdir} \
|
||||||
ABS_TOP_BUILDDIR=${abs_top_builddir} \
|
ABS_TOP_BUILDDIR=${abs_top_builddir} \
|
13
rrdtool.spec
13
rrdtool.spec
@ -16,8 +16,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.5.3
|
Version: 1.5.4
|
||||||
Release: 4%{?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/
|
||||||
@ -26,8 +26,8 @@ Source1: php4-%{svnrev}.tar.gz
|
|||||||
Patch1: rrdtool-1.4.4-php54.patch
|
Patch1: rrdtool-1.4.4-php54.patch
|
||||||
# disable logo for php 5.5.
|
# disable logo for php 5.5.
|
||||||
Patch2: rrdtool-1.4.7-php55.patch
|
Patch2: rrdtool-1.4.7-php55.patch
|
||||||
Patch3: rrdtool-1.5.0-ruby-2-fix.patch
|
Patch3: rrdtool-1.5.4-ruby-2-fix.patch
|
||||||
Patch4: rrdtool-1.5.1-lua-5.2.patch
|
Patch4: rrdtool-1.5.4-lua-5.2.patch
|
||||||
# enable php bindings on ppc
|
# enable php bindings on ppc
|
||||||
Patch5: rrdtool-1.4.8-php-ppc-fix.patch
|
Patch5: rrdtool-1.4.8-php-ppc-fix.patch
|
||||||
Patch6: rrdtool-1.5.3-arm-crash-fix.patch
|
Patch6: rrdtool-1.5.3-arm-crash-fix.patch
|
||||||
@ -399,6 +399,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 10 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1.5.4-1
|
||||||
|
- New version
|
||||||
|
Resolves: rhbz#1251737
|
||||||
|
- Defuzzified ruby-2-fix and lua-5.2 patches
|
||||||
|
|
||||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-4
|
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user