RPM: update spec files for TDE 14.0.7

1 files changed, 14 insertions, 11 deletions

diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons.spec
index 90ddfe3e6..8a048cf08 100644
--- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
 %endif
 %define tde_pkg tdeaddons
 %define tde_prefix /opt/trinity
@@ -116,13 +116,9 @@ BuildRequires:	libacl-devel
 # DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
 %define with_db 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	db4-devel
-%else
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
 BuildRequires:	db5-devel
 %endif
-%endif
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:	libdb-devel
 BuildRequires:	libdb-cxx-devel
@@ -141,6 +137,13 @@ BuildRequires:	db4-devel
 #BuildRequires:	xmms-devel
 #%endif
 
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+%define python python3
+%else
+%define python python
+%endif
+
 Requires: trinity-atlantikdesigner = %{version}-%{release}
 Requires: trinity-kaddressbook-plugins = %{version}-%{release}
 Requires: trinity-kate-plugins = %{version}-%{release}
@@ -391,7 +394,7 @@ controls XMMS, install the xmms-kde-trinity package.
 Summary: scripts for KNewsTicker, the Trinity news ticker
 Group:		Applications/Utilities
 Requires:	perl
-Requires:	python
+Requires:	%{python}
 #Requires:	libfinance-quote-perl
 #Requires:	libmime-perl
 #Requires:	libnews-nntpclient-perl
@@ -432,12 +435,12 @@ Requires:	%{_lib}jpeg62
 %if 0%{?suse_version} == 1230
 Requires:	libjpeg8
 %endif
-Requires:	python
+Requires:	%{python}
 Requires:	rsync
 #Requires:	unison
 Requires:	trinity-konqueror
 %if 0%{?fedora}
-Requires:	python-exif
+Requires:	%{python}-exif
 %endif
 
 %description -n trinity-konq-plugins
@@ -664,12 +667,12 @@ of user interfaces, playlists and visualisation plugins.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
 # Fix shebangs
 sed -i "knewsticker-scripts/sportscores.py" \
        "konq-plugins/imagerotation/orient.py" \
        "konq-plugins/imagerotation/exif.py" \
-    -e "s|env python|env python3|"
+    -e "s|env python|env %{python}|"
 %endif