[ruby-RRDtool] Fixed FTBFS on f21 (by f21-build-fix patch)
Jaroslav Škarvada
jskarvad at fedoraproject.org
Tue Jun 17 14:58:43 UTC 2014
commit 070f8b16aa0688dc10911852888a0eb759e20155
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Tue Jun 17 16:58:34 2014 +0200
Fixed FTBFS on f21 (by f21-build-fix patch)
ruby-RRDtool-0.6.0-f21-build-fix.patch | 13 +++++++++++++
ruby-RRDtool.spec | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/ruby-RRDtool-0.6.0-f21-build-fix.patch b/ruby-RRDtool-0.6.0-f21-build-fix.patch
new file mode 100644
index 0000000..79de784
--- /dev/null
+++ b/ruby-RRDtool-0.6.0-f21-build-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/rubyrrdtool.c b/rubyrrdtool.c
+index 6afef68..fb14dea 100644
+--- a/rubyrrdtool.c
++++ b/rubyrrdtool.c
+@@ -49,7 +49,7 @@ typedef int (*RRDtoolFUNC)(int argc, char ** argv);
+ * define macros for easy error checking
+ */
+
+-#define RRD_RAISE rb_raise(rb_eRRDtoolError, rrd_get_error());
++#define RRD_RAISE rb_raise(rb_eRRDtoolError, "%s", rrd_get_error());
+
+ #define RRD_CHECK_ERROR if (rrd_test_error()) RRD_RAISE
+
diff --git a/ruby-RRDtool.spec b/ruby-RRDtool.spec
index 9a18dc8..cf76f41 100644
--- a/ruby-RRDtool.spec
+++ b/ruby-RRDtool.spec
@@ -1,6 +1,6 @@
Name: ruby-RRDtool
Version: 0.6.0
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: RRDTool for Ruby
Group: Development/Languages
@@ -12,6 +12,7 @@ Source0: http://rubyforge.org/frs/download.php/13992/RubyRRDtool-%{versio
Patch0: RubyRRDtool-0.6.0.patch
Patch1: ruby-rrdtool-patch-for-ruby-1.9.3.patch
%endif
+Patch2: ruby-RRDtool-0.6.0-f21-build-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +30,7 @@ Generate RRDTool Databases from Ruby
%patch0 -p1
%patch1 -p0
%endif
+%patch2 -p1
%build
ruby extconf.rb --vendor
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_vendorarchdir}/RRDtool.so
%changelog
+* Tue Jun 17 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 0.6.0-17
+- Fixed FTBFS on f21 (by f21-build-fix patch)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list