summaryrefslogtreecommitdiffstats
path: root/redhat/applications/tde-guidance
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/tde-guidance')
-rw-r--r--redhat/applications/tde-guidance/tde-guidance.spec (renamed from redhat/applications/tde-guidance/tde-guidance-14.0.0.spec)22
1 files changed, 15 insertions, 7 deletions
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index ebf6e0021..0649514e9 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg tde-guidance
%define tde_prefix /opt/trinity
@@ -105,7 +105,7 @@ BuildRequires: libXxf86vm-devel
# RHEL 4: disabled
# RHEL 6: available in EPEL
# RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
%define with_xscreensaver 1
%if 0%{?fedora} || 0%{?rhel} >= 5
@@ -140,10 +140,18 @@ BuildRequires: xscreensaver-gl
%endif
%endif
+# PYTHON
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%else
+%define python python
+%endif
+BuildRequires: %{python}
+
Requires: python-tqt
Requires: trinity-python-trinity
Requires: trinity-pytdeextensions
-Requires: python
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
Requires: hwdata
%endif
@@ -212,7 +220,7 @@ Summary: collection of system administration tools for GNU/Linux [Trinity]
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
Requires: hwdata
%endif
-Requires: python
+Requires: %{python}
Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -307,7 +315,7 @@ if [ -d /usr/X11R6 ]; then
%__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g"
fi
-./setup.py build
+%__python ./setup.py build
%install
@@ -324,7 +332,7 @@ export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}"
export PYTHONDONTWRITEBYTECODE=
%__rm -rf %{buildroot}
-./setup.py install \
+%__python ./setup.py install \
--prefix=%{tde_prefix} \
--root=%{buildroot}
@@ -421,7 +429,7 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
# Replace all '#!' calls to python with /usr/bin/python
# and make them executable
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
%define python /usr/bin/python2
%else
%define python /usr/bin/python