RPM: update python dependencies

10 files changed, 70 insertions, 54 deletions

diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index c9cc5f878..2ebbbd677 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -113,13 +113,14 @@ BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
 # 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
 
diff --git a/redhat/applications/kstreamripper/kstreamripper.spec b/redhat/applications/kstreamripper/kstreamripper.spec
index a115bf5fc..ecbfbbdf0 100644
--- a/redhat/applications/kstreamripper/kstreamripper.spec
+++ b/redhat/applications/kstreamripper/kstreamripper.spec
@@ -83,13 +83,16 @@ BuildRequires:	brp-check-trinity
 #BuildRequires:	scons
 
 # PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1550
-%define python python2
-%define __python %__python2
+%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
 
 
 %description
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index a45941c5c..920069c38 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -33,7 +33,6 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define __arch_install_post %{nil}
 
 
@@ -140,14 +139,17 @@ BuildRequires:	xscreensaver-gl
 %endif
 %endif
 
-# PYTHON
+# PYTHON support
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
-%define python python2
-%define __python %__python2
+%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
 
 Requires:		python-tqt
 Requires:		trinity-python-trinity
diff --git a/redhat/applications/wlassistant/wlassistant.spec b/redhat/applications/wlassistant/wlassistant.spec
index ac0d47820..2859a9094 100644
--- a/redhat/applications/wlassistant/wlassistant.spec
+++ b/redhat/applications/wlassistant/wlassistant.spec
@@ -100,14 +100,17 @@ BuildRequires:	libidn-devel
 BuildRequires:	gamin-devel
 %endif
 
-# PYTHON
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
-%define python python2
-%define __python %__python2
+# PYTHON support
+%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
 
 # OPENSSL support
 BuildRequires:	openssl-devel
diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec
index 0a3731cc1..0a9a8f691 100644
--- a/redhat/dependencies/python-tqt/python-tqt.spec
+++ b/redhat/dependencies/python-tqt/python-tqt.spec
@@ -70,14 +70,15 @@ BuildRequires:	libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
 
 BuildRequires:	gcc-c++
 
-# PYTHON
-%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)")}
+# PYTHON support
+%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
 
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 601659a5e..355f74cab 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -42,8 +42,6 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
@@ -72,12 +70,15 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 
 BuildRequires:	gcc-c++
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
-%define python python2
-%define __python %__python2
+# PYTHON support
+%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
 
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
 
diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec
index 141c1d8aa..752b77632 100644
--- a/redhat/main/tdebindings/tdebindings.spec
+++ b/redhat/main/tdebindings/tdebindings.spec
@@ -168,17 +168,17 @@ BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
 %endif
 
-
-## Python
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
-%define python python2
-%define __python %__python2
+# PYTHON support
+%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
-%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 ## ruby
 BuildRequires:	ruby-devel >= 1.8
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec
index 5bd132298..c3d32ba1a 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -97,13 +97,15 @@ BuildRequires:	%{_lib}usb-compat0.1-devel
 BuildRequires:	libusb-devel
 %endif
 
-# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500
-%define python python3
-%define __python %__python3
+# PYTHON3 support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_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