summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2015-12-31 21:42:40 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2015-12-31 21:42:40 +0100
commit05215592f190ac03125d158c0b43793034120b7f (patch)
tree12134b82308ec0bd872dead7a9f0d5758fdc2946
parentde586bb8609daafbb0977a408b72c2dc0444a43b (diff)
downloadtde-packaging-05215592f190ac03125d158c0b43793034120b7f.tar.gz
tde-packaging-05215592f190ac03125d158c0b43793034120b7f.zip
RPM packaging: fix tdebindings build on opensuse tumbleweed
-rw-r--r--redhat/main/tdebindings/tdebindings-14.0.0.spec10
1 files changed, 10 insertions, 0 deletions
diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec
index d43a59b54..07e92ebbe 100644
--- a/redhat/main/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec
@@ -173,17 +173,27 @@ BuildRequires: ruby >= 1.8
%if 0%{?fedora} >= 19
BuildRequires: rubypick
%endif
+
+# Check for Ruby library directory
%if "%{?ruby_libarchdir}" != ""
%define ruby_arch %{?ruby_libarchdir}
%else
+%if "%{?rb_archdir}" != ""
+%define ruby_arch %{?rb_archdir}
+%else
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
%endif
+%endif
%if "%{?ruby_libdir}" != ""
%define ruby_rubylibdir %{?ruby_libdir}
%else
+%if "%{?rb_libdir}" != ""
+%define ruby_rubylibdir %{?rb_libdir}
+%else
%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')}
%endif
+%endif
# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')