RPM: update spec files for TDE 14.0.7

1 files changed, 18 insertions, 5 deletions

diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk.spec
index dac97e526..91ba8f601 100644
--- a/redhat/main/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/main/tdesdk/tdesdk.spec
@@ -22,7 +22,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 tdesdk
 %define tde_prefix /opt/trinity
@@ -98,7 +98,12 @@ BuildRequires:	pcre-devel
 # for kbugbuster/libkcal
 BuildRequires:	desktop-file-utils
 
+# DB5 support
+%if 0%{?rhel} >= 8
+BuildRequires:	libdb-devel
+
 # DB4 support
+%else
 %if 0%{?mgaversion} || 0%{?mdkversion}
 #BuildRequires:	%{_lib}db4.8-devel
 %endif
@@ -108,6 +113,7 @@ BuildRequires:	db4-devel
 %if 0%{?suse_version}
 BuildRequires:	libdb-4_8-devel
 %endif
+%endif
 
 # kbabel,  F-7+: flex >= 2.5.33-9
 BuildRequires:	flex
@@ -126,6 +132,13 @@ BuildRequires:	perl-podlators
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python3
+%else
+%define python python
+%endif
+
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}ltdl-devel
 BuildRequires:	%{_lib}binutils-devel
@@ -454,7 +467,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package -n trinity-tdecachegrind-converters
 Summary:	Format converters for tdecachegrind profiling visualisation tool
 Group:		Development/Languages/Other
-Requires:	python
+Requires:	%{python}
 %if 0%{?suse_version} || 0%{?rhel} == 4
 Requires:	php
 %else
@@ -543,7 +556,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
 %package scripts
 Summary:	a set of useful development scripts for Trinity
 Group:		Development/Languages/Other
-Requires:	python
+Requires:	%{python}
 
 %description scripts
 This package contains a number of scripts which can be used to help in
@@ -1007,13 +1020,13 @@ This package contains the development files for tdesdk.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 # Fix shebangs
 sed -i "scripts/kdelnk2desktop.py" \
        "scripts/zonetab2pot.py" \
        "tdecachegrind/converters/hotshot2calltree" \
        "umbrello/umbrello/headings/heading.py" \
-    -e "s|env python|env python3|"
+    -e "s|env python|env %{python}|"
 %endif