diff options
author | François Andriot <albator78@libertysurf.fr> | 2014-04-05 14:36:13 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2014-04-05 14:36:13 +0200 |
commit | 693e9a10c0362708a18799f301e8e68752e3b376 (patch) | |
tree | 24ed89d67c723ed22bfb6be8344eee5cb353ba6e /redhat/tdebindings | |
parent | 2bccc67f69c937e4db4e12f77182be57dbbb9a6a (diff) | |
download | tde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.tar.gz tde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.zip |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdebindings')
-rw-r--r-- | redhat/tdebindings/tdebindings-14.0.0.spec | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec index 0ad288c6a..ecc1090ac 100644 --- a/redhat/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/tdebindings/tdebindings-14.0.0.spec @@ -123,8 +123,18 @@ BuildRequires: python-devel ## ruby BuildRequires: ruby-devel >= 1.8, ruby +%if "%{?ruby_libarchdir}" != "" +%define ruby_arch %{?ruby_libarchdir} +%else %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} +%endif + +%if "%{?ruby_libdir}" != "" +%define ruby_rubylibdir %{?ruby_libdir} +%else %{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} +%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/') @@ -980,6 +990,10 @@ Development files for the TDE bindings. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %patch1 -p1 -b .ftbfs +%if "%{?perl_vendorarch}" == "" +exit 1 +%endif + %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %patch5 -p1 -b .ruby %endif @@ -1018,6 +1032,11 @@ if [ -d /usr/evolution28 ]; then export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" fi +# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h +%if 0%{?suse_version} >= 1310 +EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" +%endif + # Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ --prefix=%{tde_prefix} \ |