RPM: update python dependencies

4 files changed, 28 insertions, 19 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