[shogun] adapted the logic for finding rubygem-narray on Fedora >= 21
Björn Esser
besser82 at fedoraproject.org
Sat May 17 11:02:53 UTC 2014
commit 7e2398b23aa8e16dfcccece333d115be492df434
Author: Björn Esser <bjoern.esser at gmail.com>
Date: Sat May 17 13:02:00 2014 +0200
adapted the logic for finding rubygem-narray on Fedora >= 21
shogun.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/shogun.spec b/shogun.spec
index bca9fe6..5f64cce 100644
--- a/shogun.spec
+++ b/shogun.spec
@@ -80,7 +80,7 @@ of it's 'no-redistribute', 'no-commercial-use' license.
Name: shogun
Version: %{branch}.0.1
-Release: 0.17%{?gitrel}%{?dist}
+Release: 0.18%{?gitrel}%{?dist}
Summary: Large Scale Machine Learning Toolbox
# ===== License-breakdown =====
@@ -547,12 +547,18 @@ This package contains the R-plugin for %{name}.
# We need to pass the path for rubygem(narray) to CMake, so it can find it.
%global narray_gem %(gem list narray | grep narray | sed -e's! .!-!' -e 's!.$!!')
+
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+%global narray_include %{_libdir}/gems/ruby/%{narray_gem}
+%else #0%{?fedora} >= 21 || 0%{?rhel} >= 8
%global narray_include %{_datadir}/gems/gems/%{narray_gem}
+%endif #0%{?fedora} >= 21 || 0%{?rhel} >= 8
+
%if 0%{?fedora} || 0%{?rhel} >= 7
%global narray_lib %{_libdir}/gems/ruby/%{narray_gem}/narray.so
-%else
+%else #0%{?fedora} || 0%{?rhel} >= 7
%global narray_lib %{ruby_vendorarchdir}/narray.so
-%endif
+%endif #0%{?fedora} || 0%{?rhel} >= 7
Summary: Ruby-plugin for %{name}
@@ -949,6 +955,9 @@ popd
###############################################################################
%changelog
+* Sat May 17 2014 Björn Esser <bjoern.esser at gmail.com> - 3.2.0.1-0.18.git20140516.96b815f
+- adapted the logic for finding rubygem-narray on Fedora >= 21
+
* Sat May 17 2014 Björn Esser <bjoern.esser at gmail.com> - 3.2.0.1-0.17.git20140516.96b815f
- updated to new snapshot git20140516.96b815fd1fa9769a24122f9016ff5a685a8a6944
More information about the scm-commits
mailing list