diff options
| author | François Andriot <[email protected]> | 2019-03-18 20:57:03 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2019-03-28 19:45:23 +0100 |
| commit | 5fdf097f42dfeacda1d81387933ef20acedb1fc7 (patch) | |
| tree | 5ae69373db075eee458f37e658e8f66f1b880344 /redhat/main | |
| parent | 9011dcc5b79c6f60170fad0315ed914f3796ea03 (diff) | |
| download | tde-packaging-5fdf097f42dfeacda1d81387933ef20acedb1fc7.tar.gz tde-packaging-5fdf097f42dfeacda1d81387933ef20acedb1fc7.zip | |
RPM: update build scripts for TDE R14.0.6
Diffstat (limited to 'redhat/main')
| -rw-r--r-- | redhat/main/tdebase/tdebase.spec | 3 | ||||
| -rw-r--r-- | redhat/main/tdebindings/tdebindings-14.0.0.spec | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 60d7ee137..984709a6b 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -3634,6 +3634,9 @@ chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxref %__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tderandrtray" %endif +# Remove conflicting doc +%__rm -rf "%{?buildroot}%{tde_tdedocdir}/HTML/en/tdeioslave/gopher" + # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index 4fb236edc..a70c39b3d 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -190,14 +190,16 @@ BuildRequires: rubypick %if "%{%ruby_archdir}" != "" %define ruby_arch %{?ruby_archdir} %else -%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} -%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')} +%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')} %endif %endif %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]') %endif +%if 0%{?pclinuxos} +%define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]') +%endif %if "%{?ruby_libdir}" != "" %define ruby_rubylibdir %{?ruby_libdir} @@ -205,7 +207,7 @@ BuildRequires: rubypick %if "%{?rb_libdir}" != "" %define ruby_rubylibdir %{?rb_libdir} %else -%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} +%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubylibdir"]')} %endif %endif @@ -993,6 +995,14 @@ This package contains the development files for the TDE bindings. exit 1 %endif +%if "%{?ruby_rubylibdir}" == "" +exit 2 +%endif + +%if "%{?ruby_arch}" == "" +exit 3 +%endif + # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \ |