From 065214e736e0b9057ed145e325629bfe60fd5946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 6 Sep 2020 19:28:48 +0200 Subject: RPM: update python dependencies --- redhat/libraries/pytdeextensions/pytdeextensions.spec | 14 ++++++++------ redhat/libraries/python-trinity/python-trinity.spec | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'redhat/libraries') diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 7a1919d30..e0add057f 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" @@ -76,13 +75,16 @@ BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 -%define python python2 -%define __python %__python2 -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} %else -%define python python +%global python python %endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec index 30ed147c1..56edb835f 100644 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ b/redhat/libraries/python-trinity/python-trinity.spec @@ -63,13 +63,14 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ # PYTHON support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 -%define python python2 -%define __python %__python2 -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} %else -%define python python +%global python python %endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} BuildRequires: %{python} BuildRequires: %{python}-devel -- cgit v1.2.1