From c34960529cde4e1c5721191d897761f059c35748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 17 Apr 2024 19:16:43 +0200 Subject: RPM: lots of updates for Trinity 14.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/core/tdebindings/tdebindings.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'redhat/core/tdebindings') 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 -- cgit v1.2.1