1 files changed, 20 insertions, 6 deletions
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 2eafa51b3..04f86ad6d 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tdeutils
 %define tde_prefix /opt/trinity
@@ -81,9 +81,19 @@ BuildRequires:	fdupes
 
 BuildRequires:	gettext
 BuildRequires:	net-snmp-devel
-BuildRequires:	python-devel
 BuildRequires:	gmp-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)")}
+%else
+%define python python
+%endif
+BuildRequires:	%{python}
+BuildRequires:	%{python}-devel
+
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -135,7 +145,7 @@ BuildRequires:	pcre-devel
 BuildRequires:	libacl-devel
 
 # XSCREENSAVER support
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 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 || 0%{?suse_version}
 BuildRequires:	libXScrnSaver-devel
@@ -574,7 +584,7 @@ power management, for laptops, from within TDE.
 %{_sbindir}/klaptop_acpi_helper
 %endif
 
-%config %{tde_confdir}/kcmlaptoprc
+%config(noreplace) %{tde_confdir}/kcmlaptoprc
 
 %endif
 
@@ -680,7 +690,7 @@ connections, power, etc.
 
 %files -n trinity-ksim
 %defattr(-,root,root,-)
-%config %{tde_confdir}/ksim_panelextensionrc
+%config(noreplace) %{tde_confdir}/ksim_panelextensionrc
 %{tde_tdelibdir}/ksim_*.la
 %{tde_tdelibdir}/ksim_*.so
 %{tde_libdir}/libksimcore.so.*
@@ -948,7 +958,11 @@ export PATH="%{tde_bindir}:${PATH}"
 %endif
 
 # Fix desktop shortcut location
-%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
+  %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+  %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+  %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
+fi
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}