diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-04-17 19:16:43 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-04-17 19:17:09 +0200 |
| commit | c34960529cde4e1c5721191d897761f059c35748 (patch) | |
| tree | 0eca82c4e0c7c5a53931a62ae8718d3f6d8b2914 /redhat/core/tdebindings | |
| parent | 4682d07bdc78302d8eb5caf4d6aea5381c1c1df5 (diff) | |
| download | tde-packaging-c34960529cde4e1c5721191d897761f059c35748.tar.gz tde-packaging-c34960529cde4e1c5721191d897761f059c35748.zip | |
RPM: lots of updates for Trinity 14.1.2
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/core/tdebindings')
| -rw-r--r-- | redhat/core/tdebindings/tdebindings.spec | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 27fb4156b..5ab3d977b 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -1139,14 +1139,8 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu" %endif -if [ -d "/usr/include/python3.6m" ]; then - EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}" -fi - -# Fedora >= 39 comes with python 3.12, but we want version 3.11 -%if 0%{?fedora} >= 39 -export PYTHON=%{__python3} -%endif +# Force python version +export PYTHON=%{__python} # Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ @@ -1176,6 +1170,11 @@ export PYTHON=%{__python3} %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \ %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla} +# Ensure python was detected properly +if grep "LIBPYTHON=''" "config.log"; then + exit 1 +fi + # Build dcopperl with specific options pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3 |