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

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

1 files changed, 10 insertions, 5 deletions

diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index eee0076ca..5ee4de02c 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -99,7 +99,12 @@ BuildRequires:	libtool
 BuildRequires:	libtool-ltdl-devel
 %endif
 
+%if 0%{?fedora} >= 37
+BuildRequires:	libusb1-devel
+BuildRequires:	libusb-compat-0.1-devel
+%else
 BuildRequires:	libusb-devel
+%endif
 BuildRequires:	mysql-devel
 BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
@@ -126,7 +131,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
@@ -167,7 +172,7 @@ BuildRequires:	karma-sharp
 %endif
 
 # GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
 BuildRequires:	libgpod-devel >= 0.4.2
 %endif
@@ -264,11 +269,11 @@ BuildRequires:	rubypick
 %endif
 
 # PYTHON support
-%if 0%{?sle_version} >= 150400
+%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 8
 %define python python3
 %define __python %__python3
 %else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
 %global python python2
 %global __python %__python2
 %global python_sitearch %{python2_sitearch}
@@ -466,7 +471,7 @@ fi
           "amarok/src/scripts/webcontrol/Playlist.py" \
           "amarok/src/scripts/webcontrol/RequestHandler.py" \
           "amarok/src/scripts/webcontrol/WebControl.py" \
-  -e "s|/usr/bin/env python|/usr/bin/env python2|"
+  -e "s|/usr/bin/env python|/usr/bin/env %{python}|"
 %endif