From 05215592f190ac03125d158c0b43793034120b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 31 Dec 2015 21:42:40 +0100 Subject: RPM packaging: fix tdebindings build on opensuse tumbleweed --- redhat/main/tdebindings/tdebindings-14.0.0.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) 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/') -- cgit v1.2.3