RPM: massive update and cleanup

1 files changed, 16 insertions, 12 deletions

diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 6432e8099..3f5a23803 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -28,7 +28,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg sip4-tqt
 %define tde_prefix /opt/trinity
@@ -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}
@@ -71,8 +69,18 @@ BuildRequires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 
 BuildRequires:	gcc-c++
-BuildRequires:	python
-BuildRequires:	python-devel
+
+# 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
+%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
 SIP is a tool for generating bindings for C++ classes with some ideas
@@ -85,7 +93,7 @@ specificity towards C++ and Python.
 Summary:	Python/C++ bindings generator (Runtime Library)
 Group:		Development/Tools/Building
 Requires:	trinity-filesystem >= %{tde_version}
-Requires:	python
+Requires:	%{python}
 
 %description -n sip4-tqt
 SIP is a tool for generating bindings for C++ classes with some ideas
@@ -94,11 +102,7 @@ specificity towards C++ and Python.
 
 %files -n sip4-tqt
 %defattr(-,root,root,-)
-%dir %{python_sitearch}/sip4_tqt
-%{python_sitearch}/sip4_tqt/sip.so
-%{python_sitearch}/sip4_tqt/sipconfig.py*
-%{python_sitearch}/sip4_tqt/sipdistutils.py*
-%{python_sitearch}/sip4_tqt/__init__.py*
+%{python_sitearch}/sip4_tqt/
 
 ##########
 
@@ -106,7 +110,7 @@ specificity towards C++ and Python.
 Summary:		Python/C++ bindings generator (Development Files)
 Group:			Development/Libraries/Python
 Requires:		sip4-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		python-devel
+Requires:		%{python}-devel
 
 %description -n sip4-tqt-devel
 SIP is a tool for generating bindings for C++ classes with some ideas