From 611f3c9b39b3c7e949019e0c1d108aec25e318b7 Mon Sep 17 00:00:00 2001 From: Adam Osuchowski Date: Sun, 26 Feb 2017 00:01:33 +0100 Subject: [PATCH] - fixed ruby subpackage building --- ecasound-ruby.patch | 12 ++++++++++++ ecasound.spec | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 ecasound-ruby.patch diff --git a/ecasound-ruby.patch b/ecasound-ruby.patch new file mode 100644 index 0000000..4c1ff0f --- /dev/null +++ b/ecasound-ruby.patch @@ -0,0 +1,12 @@ +diff -ruN ecasound-2.9.1.orig/configure.ac ecasound-2.9.1/configure.ac +--- ecasound-2.9.1.orig/configure.ac 2014-01-03 11:34:07.000000000 +0100 ++++ ecasound-2.9.1/configure.ac 2017-02-25 23:46:30.167878523 +0100 +@@ -749,7 +749,7 @@ + rubyecasound_support=no + ECA_S_RUBY_SITEDIR="" + else +- ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG[["sitedir"]] + "/" + CONFIG[["MAJOR"]] + "." + CONFIG[["MINOR"]]'`" ++ ECA_S_RUBY_SITEDIR="`ruby -rrbconfig -e 'print RbConfig::CONFIG[["vendordir"]]'`" + fi + + AC_SUBST(ECA_S_RUBY_SITEDIR) diff --git a/ecasound.spec b/ecasound.spec index 0373a2c..9478ff2 100644 --- a/ecasound.spec +++ b/ecasound.spec @@ -16,6 +16,7 @@ Source0: http://ecasound.seul.org/download/%{name}-%{version}.tar.gz # Source0-md5: 13c7be1e4eddc0bbf3792dc17777e465 Patch0: %{name}-link.patch Patch1: %{name}-acam.patch +Patch2: %{name}-ruby.patch URL: http://www.eca.cx/ecasound/ %{?with_alsa:BuildRequires: alsa-lib-devel >= 0.9.0} %{?with_arts:BuildRequires: arts-devel} @@ -144,6 +145,7 @@ Moduł języka Ruby dla programu ecasound. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -166,6 +168,7 @@ CXXFLAGS="%{rpmcflags} -D_REENTRANT %{!?debug:-DNDEBUG}" --enable-shared \ --enable-sys-readline \ --enable-pyecasound \ + %{?with_ruby:--enable-rubyecasound} \ --with-largefile \ --with-python-includes=%{py_incdir} \ --with-python-modules=%{py_libdir} @@ -236,5 +239,5 @@ rm -rf $RPM_BUILD_ROOT %if %{with ruby} %files -n ruby-%{name} %defattr(644,root,root,755) -%{ruby_sitelibdir}/ecasound.rb +%{ruby_vendorlibdir}/ecasound.rb %endif -- 2.43.0