From 26a9a7c9f4f4fd5816a1e006d49b8baec1c274cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Mar 2013 15:51:52 +0100 Subject: [PATCH] Fixed build failure with ruby-2.0 (by ruby-2-fix patch) - Fixed bogus date in changelog --- rrdtool-1.4.7-ruby-2-fix.patch | 20 ++++++++++++++++++++ rrdtool.spec | 11 +++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 rrdtool-1.4.7-ruby-2-fix.patch diff --git a/rrdtool-1.4.7-ruby-2-fix.patch b/rrdtool-1.4.7-ruby-2-fix.patch new file mode 100644 index 0000000..97e02a6 --- /dev/null +++ b/rrdtool-1.4.7-ruby-2-fix.patch @@ -0,0 +1,20 @@ +diff -up rrdtool-1.4.7/bindings/Makefile.in.origs rrdtool-1.4.7/bindings/Makefile.in +--- rrdtool-1.4.7/bindings/Makefile.in.origs 2012-01-24 11:09:10.000000000 +0100 ++++ rrdtool-1.4.7/bindings/Makefile.in 2013-03-18 14:48:23.074370021 +0100 +@@ -659,14 +659,12 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COM + install-data-local: + $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true + $(AM_V_GEN)test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true +- $(AM_V_GEN)test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true ++ $(AM_V_GEN)test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) hdrdir="$(includedir)" rubyhdrdir="$(includedir)" install || true + $(AM_V_GEN)test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true + + # rules for building the ruby module +-# RUBYARCHDIR= is to work around in a makefile quirk not sure +-# it is is the right thing todo, but it makes rrdtool build on freebsd as well + ruby: Makefile +- cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR= ++ cd ruby && $(RUBY) extconf.rb && $(MKDIR_P) $(DESTDIR)$(libdir)/ruby/vendor_ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) hdrdir="$(includedir)" rubyhdrdir="$(includedir)" + + # rules for building the pyton module + python: Makefile diff --git a/rrdtool.spec b/rrdtool.spec index aad43ca..73708ec 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -18,13 +18,15 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.4.7 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases URL: http://oss.oetiker.ch/rrdtool/ Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz Source1: php4-%{svnrev}.tar.gz Patch1: rrdtool-1.4.4-php54.patch +# workaround for rhbz#92165 +Patch2: rrdtool-1.4.7-ruby-2-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: dejavu-sans-mono-fonts, dejavu-lgc-sans-mono-fonts @@ -164,6 +166,7 @@ The %{name}-lua package includes RRDtool bindings for Lua. %if %{with_php} %patch1 -p1 -b .php54 %endif +%patch2 -p1 -b .ruby-2-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' \ @@ -374,6 +377,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Mon Mar 18 2013 Jaroslav Škarvada - 1.4.7-10 +- Fixed build failure with ruby-2.0 (by ruby-2-fix patch) +- Fixed bogus date in changelog + * Thu Feb 14 2013 Fedora Release Engineering - 1.4.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -696,7 +703,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ * Thu Jan 13 2005 Matthias Saou 1.0.49-2 - Minor cleanups. -* Thu Aug 25 2004 Dag Wieers - 1.0.49-1 +* Wed Aug 25 2004 Dag Wieers - 1.0.49-1 - Updated to release 1.0.49. * Wed Aug 25 2004 Dag Wieers - 1.0.48-3