From b504f7ef7837e88d471f3601da710a92d58108a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 6 Nov 2022 11:46:08 +0100
Subject: RPM: updates (cherry-pick from TDE R14.0.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/main/tdeaddons/tdeaddons.spec | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'redhat/main/tdeaddons')

diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
index 83fda2d77..ca731fc4d 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -30,6 +30,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -99,7 +100,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
@@ -138,8 +139,9 @@ BuildRequires:	db4-devel
 #%endif
 
 # PYTHON2 support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
 %define with_python 0
+%global __python %__python3
 %else
 %define with_python 1
 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 30 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 7
@@ -198,6 +200,7 @@ America and Europe.
 %{tde_tdeappdir}/atlantikdesigner.desktop
 %{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png
 %{tde_tdedocdir}/HTML/en/atlantikdesigner/
+%{tde_mandir}/man1/atlantikdesigner.1*
 
 ##########
 
@@ -355,6 +358,7 @@ provided for audio and image files.
 %{tde_datadir}/services/tdefile_txt.desktop
 %{tde_datadir}/services/renaudiodlg.desktop
 %{tde_datadir}/services/renimagedlg.desktop
+%{tde_mandir}/man1/lnkforward.1*
 
 ##########
 
@@ -582,6 +586,10 @@ graphical disk usage viewer and image conversions and transformations.
 %{tde_tdelibdir}/libadblock.la
 %{tde_tdelibdir}/libadblock.so
 %{tde_tdedocdir}/HTML/en/konq-plugins/
+%{tde_mandir}/man1/exif.py.1*
+%{tde_mandir}/man1/fsview.1*
+%{tde_mandir}/man1/jpegorient.1*
+%{tde_mandir}/man1/orient.py.1*
 
 ##########
 
@@ -607,6 +615,7 @@ signatures in external mail clients such as KMail.
 %{tde_datadir}/apps/ksig/
 %{tde_datadir}/icons/hicolor/*/apps/ksig.png
 %{tde_tdedocdir}/HTML/en/ksig/
+%{tde_mandir}/man1/ksig.1*
 
 ##########
 
@@ -664,6 +673,9 @@ of user interfaces, playlists and visualisation plugins.
 %{tde_tdelibdir}/noatunwavecapture.so
 %{tde_datadir}/apps/noatun/*
 %{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png
+%{tde_mandir}/man1/noatunsynaescope.bin.1*
+%{tde_mandir}/man1/noatuntippecanoe.bin.1*
+%{tde_mandir}/man1/noatuntyler.bin.1*
 
 ##########
 
-- 
cgit v1.2.1