Accepting request 182734 from home:k0da:ppc

- rename rrdtool-lua_lib64.patch to rrdtool-lua-ruby_lib64.patch 
  since it sets libdir for ruby as well
- Package ruby bindings into ruby-rrdtool package

OBS-URL: https://build.opensuse.org/request/show/182734
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=41
This commit is contained in:
Tomáš Chvátal 2013-07-11 07:38:09 +00:00 committed by Git OBS Bridge
parent 44850f2fcc
commit e280542d7b
3 changed files with 43 additions and 1 deletions

View File

@ -2,6 +2,15 @@ Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -27550,7 +27550,7 @@ fi
if test "${enable_ruby_site_install+set}" = set; then
enableval=$enable_ruby_site_install; RUBY_MAKE_OPTIONS=
else
- RUBY_MAKE_OPTIONS="sitedir=$langpref/lib/ruby"
+ RUBY_MAKE_OPTIONS="sitedir=$langpref/lib64/ruby"
fi
@@ -29316,7 +29316,7 @@ fi
done
fi
@ -15,6 +24,15 @@ Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -675,7 +675,7 @@ fi
dnl pass additional ruby options when generating Makefile from Makefile.PL
AC_ARG_ENABLE(ruby-site-install,
AS_HELP_STRING([--enable-ruby-site-install],[by default the rrdtool ruby modules are installed together with rrdtool in $prefix/lib/ruby. You have to add $prefix/lib/ruby/$ruby_version/$sitearch to your $: variable for ruby to find the RRD.so file.]),
-[RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS="sitedir=$langpref/lib/ruby"])
+[RUBY_MAKE_OPTIONS=],[RUBY_MAKE_OPTIONS="sitedir=$langpref/lib64/ruby"])
AC_ARG_WITH(ruby-options,
@@ -782,7 +782,7 @@ LUA_EOF
done
fi

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 10 15:02:53 UTC 2013 - dvaleev@suse.com
- rename rrdtool-lua_lib64.patch to rrdtool-lua-ruby_lib64.patch
since it sets libdir for ruby as well
- Package ruby bindings into ruby-rrdtool package
-------------------------------------------------------------------
Sat Jun 1 09:20:20 UTC 2013 - schwab@suse.de

View File

@ -48,7 +48,7 @@ Version: 1.4.7
Release: 0
%define cgilib_version 0.7
Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz
Patch1: rrdtool-lua_lib64.patch
Patch1: rrdtool-lua-ruby_lib64.patch
Patch2: rrdtool-tclversion.patch
Patch3: rrdtool-tclsegfault.patch
Source1: http://www.infodrom.org/projects/cgilib/download/cgilib-%{cgilib_version}.tar.gz
@ -243,4 +243,21 @@ This package contains the Tcl bindings
%{tcl_archdir}/*
%{_libdir}/tclrrd*.so
%package -n ruby-rrdtool
Summary: Ruby bindings for rrdtool
Group: Productivity/Scientific/Math
Requires: ruby
%description -n ruby-rrdtool
A tool to log and analyze data gathered from all kinds of data sources.
The data analysis part of RRDtool is based on the ability to quickly
generate graphical representations of the data values collected over a
definable time period.
This package contains the Ruby bindings
%files -n ruby-rrdtool
%defattr(-, root, root)
%{rb_archdir}/RRD.so
%changelog