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

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

1 files changed, 23 insertions, 2 deletions

diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec
index 7d3037300..f5885d39f 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/main/tdegraphics/tdegraphics.spec
@@ -28,6 +28,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
@@ -80,13 +81,18 @@ 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
 
 # LIBUSB support
-BuildRequires: libusb-devel
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
+BuildRequires:	libusb-devel
+%endif
 
 # MNG support
 BuildRequires: libmng-devel
@@ -339,6 +345,8 @@ picker.
 %{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png
 %{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png
 %{tde_tdedocdir}/HTML/en/kcoloredit/
+%{tde_mandir}/man1/kcolorchooser.1*
+%{tde_mandir}/man1/kcoloredit.1*
 
 ##########
 
@@ -435,6 +443,7 @@ This program and KPart allow the user to display *.DVI files from TeX.
 %{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz
 %{tde_datadir}/services/kdvimultipage.desktop
 %{tde_tdedocdir}/HTML/en/kdvi/
+%{tde_mandir}/man1/kdvi.1*
 
 ##########
 
@@ -454,6 +463,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images
 %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz
 %{tde_tdedocdir}/HTML/en/kfax/
+%{tde_mandir}/man1/kfax.1*
 
 ##########
 
@@ -480,6 +490,7 @@ kfax application once it reproduces all of kfax's features.
 %{tde_datadir}/services/kfaxmultipage.desktop
 %{tde_datadir}/services/kfaxmultipage_tiff.desktop
 %{tde_tdedocdir}/HTML/en/kfaxview/
+%{tde_mandir}/man1/kfaxview.1*
 
 ##########
 
@@ -533,6 +544,7 @@ online.
 %{tde_datadir}/icons/hicolor/*/apps/kghostview.png
 %{tde_datadir}/services/kghostview_part.desktop
 %{tde_tdedocdir}/HTML/en/kghostview/
+%{tde_mandir}/man1/kghostview.1*
 
 ##########
 
@@ -553,6 +565,7 @@ TDEIconedit allows you easily to create and edit icons.
 %{tde_datadir}/apps/tdeiconedit/
 %{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
 %{tde_tdedocdir}/HTML/en/tdeiconedit/
+%{tde_mandir}/man1/tdeiconedit.1*
 
 ##########
 
@@ -620,6 +633,7 @@ Homepage: http://kolourpaint.sourceforge.net
 %{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz
 %{tde_tdedocdir}/HTML/en/kolourpaint/
+%{tde_mandir}/man1/kolourpaint.1*
 
 ##########
 
@@ -650,6 +664,7 @@ Homepage: http://kooka.kde.org/
 %config(noreplace) %{tde_confdir}/kookarc
 %{tde_datadir}/icons/hicolor/*/apps/kooka.png
 %{tde_tdedocdir}/HTML/en/kooka/
+%{tde_mandir}/man1/kooka.1*
 
 ##########
 
@@ -675,6 +690,7 @@ application.
 %{tde_datadir}/icons/hicolor/*/apps/kpdf.png
 %{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz
 %{tde_datadir}/services/kpdf_part.desktop
+%{tde_mandir}/man1/kpdf.1*
 
 ##########
 
@@ -708,6 +724,7 @@ Homepage: http://www.kpovmodeler.org
 %{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
 %{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.*
 %doc %{tde_tdedocdir}/HTML/en/kpovmodeler/
+%{tde_mandir}/man1/kpovmodeler.1*
 
 ##########
 
@@ -726,6 +743,7 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE.
 %{tde_datadir}/apps/kruler/
 %{tde_datadir}/icons/hicolor/*/apps/kruler.png
 %{tde_tdedocdir}/HTML/en/kruler/
+%{tde_mandir}/man1/kruler.1*
 
 ##########
 
@@ -745,6 +763,7 @@ The images can then be saved in a variety of formats.
 %{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png
 %{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz
 %{tde_tdedocdir}/HTML/en/ksnapshot/
+%{tde_mandir}/man1/ksnapshot.1*
 
 ##########
 
@@ -832,6 +851,7 @@ as well.
 %{tde_datadir}/servicetypes/kimageviewer.desktop
 %{tde_datadir}/servicetypes/kimageviewercanvas.desktop
 %{tde_tdedocdir}/HTML/en/kview/
+%{tde_mandir}/man1/kview.1*
 
 ##########
 
@@ -868,6 +888,7 @@ DjVu images.
 %{tde_datadir}/services/emptymultipage.desktop
 %{tde_datadir}/services/djvumultipage.desktop
 %{tde_datadir}/servicetypes/tdemultipage.desktop
+%{tde_mandir}/man1/kviewshell.1*
 
 ##########