RPM: update packaging for R14.1.5

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

13 files changed, 39 insertions, 23 deletions

diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index 04c1f0995..b8f059362 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg amarok
 %define tde_prefix /opt/trinity
@@ -111,15 +111,23 @@ BuildRequires:	libtool
 BuildRequires:	libtool-ltdl-devel
 %endif
 
-%if 0%{?fedora} >= 37
+# LIBUSB support
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
 BuildRequires:	libusb1-devel
 BuildRequires:	libusb-compat-0.1-devel
 %else
 BuildRequires:	libusb-devel
 %endif
-BuildRequires:	mysql-devel
+
 BuildRequires:	taglib-devel
 
+# MYSQL support
+%if 0%{?rhel} >= 10
+BuildRequires:	mariadb-devel
+%else
+BuildRequires:	mysql-devel
+%endif
+
 # SDL support
 %if 0%{?mdkver}
 BuildRequires:	%{_lib}SDL-devel
@@ -211,7 +219,7 @@ BuildRequires:	libmtp-devel
 %endif
 
 # Creative Nomad Jukebox
-%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
+%if ( 0%{?fedora} >= 19 && 0%{?fedora} <= 41 ) || 0%{?mgaversion} || 0%{?mdkversion} || ( 0%{?suse_version} >= 1220 && 0%{?suse_version} < 1600 )
 %define with_njb 1
 %if 0%{?mdkver}
 BuildRequires:	%{_lib}njb-devel
@@ -221,7 +229,7 @@ BuildRequires:	libnjb-devel
 %endif
 
 # VISUAL support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if ( 0%{?rhel} >= 4 && 0%{?rhel} <= 9 ) || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_libvisual 1
 %if 0%{?mdkver}
 BuildRequires:	%{_lib}visual-devel
@@ -565,6 +573,10 @@ fi
 # Removes '.so' to avoid automatic -devel dependency
 %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so
 
+%if 0%{?with_libvisual} == 0
+%__rm -f $RPM_BUILD_ROOT%{tde_mandir}/man1/amarok_libvisual.1*
+%endif
+
 # Locales
 %find_lang %{tde_pkg}
 
diff --git a/redhat/applications/multimedia/codeine/codeine.spec b/redhat/applications/multimedia/codeine/codeine.spec
index 5535d81f5..d14c72503 100644
--- a/redhat/applications/multimedia/codeine/codeine.spec
+++ b/redhat/applications/multimedia/codeine/codeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg codeine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
index 4e7579dbe..0ddcdcf41 100644
--- a/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
+++ b/redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg k3b-i18n
 %define tde_prefix /opt/trinity
@@ -393,6 +393,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}%{tde_datadir}/locale/cs
 %__rm -rf %{buildroot}%{tde_datadir}/locale/cy
 %__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB
+%__rm -rf %{buildroot}%{tde_datadir}/locale/es_AR
 %__rm -rf %{buildroot}%{tde_datadir}/locale/eu
 %__rm -rf %{buildroot}%{tde_datadir}/locale/fa
 %__rm -rf %{buildroot}%{tde_datadir}/locale/fi
diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index 86b10e545..354901af0 100644
--- a/redhat/applications/multimedia/k3b/k3b.spec
+++ b/redhat/applications/multimedia/k3b/k3b.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg k3b
 %define tde_prefix /opt/trinity
@@ -84,7 +84,6 @@ BuildRequires: %{_lib}asound-devel
 BuildRequires: alsa-lib-devel
 %endif
 
-BuildRequires:	audiofile-devel
 BuildRequires:	gettext
 BuildRequires:	taglib-devel
 BuildRequires:	zlib-devel
@@ -139,17 +138,21 @@ Requires(postun): coreutils
 Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 10
 Requires:		wodim
 REquires:		genisoimage
 %else
 Requires:		cdrecord
 REquires:		mkisofs
 %endif
+
+# dvd+rw-tools support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 )
 Requires:		dvd+rw-tools
+%endif
 
 # CDRDAO support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || ( 0%{?rhel} >= 5 && 0%{?rhel} <= 9 )
 Requires:		cdrdao
 %endif
 
@@ -273,7 +276,7 @@ BuildRequires:	ffmpeg-devel
 %endif
 
 # MUSEPACK
-%if 0%{?fedora} == 0 || 0%{?fedora} <= 37
+%if 0%{?fedora} <= 37 && 0%{?rhel} <= 9
 # Looking for mpc_decoder_setup in mpcdec - not found
 %define with_musepack 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
diff --git a/redhat/applications/multimedia/k9copy/k9copy.spec b/redhat/applications/multimedia/k9copy/k9copy.spec
index 743176af6..b8f3f2448 100644
--- a/redhat/applications/multimedia/k9copy/k9copy.spec
+++ b/redhat/applications/multimedia/k9copy/k9copy.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg k9copy
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
index 28fe7fc02..f035a39ec 100644
--- a/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
+++ b/redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec
@@ -19,7 +19,7 @@
 %define tde_pkg kaffeine-mozilla
 %define tde_prefix /opt/trinity
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 
 # TDE specific building variables
diff --git a/redhat/applications/multimedia/kaffeine/kaffeine.spec b/redhat/applications/multimedia/kaffeine/kaffeine.spec
index b14ecd110..0b4a2abed 100644
--- a/redhat/applications/multimedia/kaffeine/kaffeine.spec
+++ b/redhat/applications/multimedia/kaffeine/kaffeine.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg kaffeine
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index 135a4bd69..670b70fa2 100644
--- a/redhat/applications/multimedia/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg kmplayer
 %define tde_prefix /opt/trinity
@@ -337,7 +337,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
 
 # Updates applications categories for openSUSE
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
 %suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
 %endif
 
diff --git a/redhat/applications/multimedia/kplayer/kplayer.spec b/redhat/applications/multimedia/kplayer/kplayer.spec
index 8325ea14a..e263a6432 100644
--- a/redhat/applications/multimedia/kplayer/kplayer.spec
+++ b/redhat/applications/multimedia/kplayer/kplayer.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg kplayer
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
index 0b6b596a1..e38b4ad93 100644
--- a/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
+++ b/redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg mplayerthumbs
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index c2f34079e..8eef7280e 100644
--- a/redhat/applications/multimedia/rosegarden/rosegarden.spec
+++ b/redhat/applications/multimedia/rosegarden/rosegarden.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg rosegarden
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
index 394fccd42..aed3ac741 100644
--- a/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
+++ b/redhat/applications/multimedia/soundkonverter/soundkonverter.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg soundkonverter
 %define tde_prefix /opt/trinity
diff --git a/redhat/applications/multimedia/tderadio/tderadio.spec b/redhat/applications/multimedia/tderadio/tderadio.spec
index 2c1899459..412e1a05a 100644
--- a/redhat/applications/multimedia/tderadio/tderadio.spec
+++ b/redhat/applications/multimedia/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.4
+%define tde_version 14.1.5
 %endif
 %define tde_pkg tderadio
 %define tde_prefix /opt/trinity
@@ -193,7 +193,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__make install DESTDIR=%{buildroot} -C build
 
 # Updates applications categories for openSUSE
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
 %endif