diff --git a/rrdtool-1.4.7-ruby-2-fix.patch b/rrdtool-1.4.7-ruby-2-fix.patch index 97e02a6..94ae741 100644 --- a/rrdtool-1.4.7-ruby-2-fix.patch +++ b/rrdtool-1.4.7-ruby-2-fix.patch @@ -6,7 +6,7 @@ diff -up rrdtool-1.4.7/bindings/Makefile.in.origs rrdtool-1.4.7/bindings/Makefil $(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 -f ruby/Makefile && $(MKDIR_P) $(DESTDIR)$(libdir)/ruby/vendor_ruby && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) hdrdir="$(includedir)" rubyhdrdir="$(includedir)" includedir="$(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 @@ -14,7 +14,7 @@ diff -up rrdtool-1.4.7/bindings/Makefile.in.origs rrdtool-1.4.7/bindings/Makefil -# 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)" ++ cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) hdrdir="$(includedir)" rubyhdrdir="$(includedir)" includedir="$(includedir)" # rules for building the pyton module python: Makefile diff --git a/rrdtool.spec b/rrdtool.spec index f9d35e3..f467810 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -18,7 +18,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.4.7 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases URL: http://oss.oetiker.ch/rrdtool/ @@ -205,6 +205,8 @@ cp -p /usr/lib/rpm/config.{guess,sub} php4/ %endif %if %{with_ruby} --enable-ruby \ +%else + --disable-ruby \ %endif --disable-static \ --with-pic @@ -379,6 +381,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Mon Mar 25 2013 Jaroslav Škarvada - 1.4.7-13 +- Fixed build failure + Resolves: rhbz#926037 + * Fri Mar 22 2013 Remi Collet - 1.4.7-12 - rebuild for http://fedoraproject.org/wiki/Features/Php55 - remove rrdtool_logo_guid function