RPM: updates (cherry-pick from TDE R14.0.13)

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 7 insertions, 6 deletions

diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec
index 76e327043..7002a965b 100644
--- a/redhat/applications/tellico/tellico.spec
+++ b/redhat/applications/tellico/tellico.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 9
 %define _hardened_ldflags %nil
 %endif
 
@@ -13,7 +13,7 @@
 # file, is the same license as for the pristine package itself (unless the
 # license for the pristine package is not an Open Source License, in which
 # case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
+# license that confolrms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
@@ -139,7 +139,7 @@ BuildRequires:	libidn-devel
 
 # GAMIN support
 #  Not on openSUSE.
-%if 0%{?rhel} || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || ( 0%{?fedora} && 0%{?fedora} <= 33 ) || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gamin 1
 BuildRequires:	gamin-devel
 %endif
@@ -154,11 +154,11 @@ BuildRequires:	libacl-devel
 BuildRequires:	libattr-devel
 
 # PYTHON support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
 %define python python3
 %define __python %__python3
 %else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
@@ -197,6 +197,7 @@ It also makes it easy for other softwares to use the Tellico data.
 %{tde_bindir}/tellico
 %{tde_datadir}/applications
 %config(noreplace) %{tde_confdir}/tellicorc
+%{tde_mandir}/man1/tellico.1*
 
 ##########
 
@@ -297,7 +298,7 @@ fi
           "src/fetch/scripts/ministerio_de_cultura.py" \
           "src/fetch/scripts/fr.allocine.py" \
           "src/translators/griffith2tellico.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif