RPM: synchronize redhat directory with r14.1.x branch

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

1 files changed, 58 insertions, 8 deletions

diff --git a/redhat/applications/multimedia/k3b/k3b.spec b/redhat/applications/multimedia/k3b/k3b.spec
index ed7d62590..ddbdf76df 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.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg k3b
 %define tde_prefix /opt/trinity
@@ -77,14 +77,26 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	alsa-lib-devel
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
 BuildRequires:	audiofile-devel
 BuildRequires:	gettext
-BuildRequires:	libmpcdec-devel
-BuildRequires:	libvorbis-devel
 BuildRequires:	taglib-devel
 BuildRequires:	zlib-devel
 
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
 # IDN support
 BuildRequires:	libidn-devel
 
@@ -96,13 +108,26 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -126,8 +151,12 @@ Requires:		cdrdao
 
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # HAL support
 %if 0%{?rhel} == 5
@@ -149,13 +178,21 @@ Requires:		trinity-dbus-tqt >= 1:0.63
 # SNDFILE support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
 %define with_sndfile 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}sndfile-devel
+%else
 BuildRequires:	libsndfile-devel
 %endif
+%endif
 
 # SAMPLERATE support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
 %define with_samplerate 1
-BuildRequires:	libsamplerate-devel
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}samplerate-devel
+%else
+BuildRequires: libsamplerate-devel
+%endif
 %endif
 
 # DVDREAD support
@@ -227,6 +264,17 @@ BuildRequires:	ffmpeg-devel
 %endif
 %endif
 
+# MUSEPACK
+%if 0%{?fedora} == 0 || 0%{?fedora} <= 37
+# Looking for mpc_decoder_setup in mpcdec - not found
+%define with_musepack 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}mpcdec-devel
+%else
+BuildRequires:	libmpcdec-devel
+%endif
+%endif
+
 
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
@@ -260,8 +308,10 @@ start.
 %{tde_tdelibdir}/libk3blibsndfiledecoder.la
 %{tde_tdelibdir}/libk3blibsndfiledecoder.so
 %endif
+%if 0%{?with_musepack}
 %{tde_tdelibdir}/libk3bmpcdecoder.la
 %{tde_tdelibdir}/libk3bmpcdecoder.so
+%endif
 %{tde_tdelibdir}/libk3boggvorbisdecoder.la
 %{tde_tdelibdir}/libk3boggvorbisdecoder.so
 %{tde_tdelibdir}/libk3boggvorbisencoder.la
@@ -426,7 +476,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
 %endif
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
@@ -453,7 +503,7 @@ fi
   -DWITH_ALL_OPTIONS="ON" \
   -DWITH_MUSICBRAINZ="OFF" \
   -DWITH_FFMPEG_ALL_CODECS="ON" \
-  -DWITH_MUSEPACK="ON" \
+  -DWITH_MUSEPACK="%{!?with_musepack:OFF}%{?with_musepack:ON}" \
   -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \
   -DWITH_MAD="%{!?with_libmad:OFF}%{?with_libmad:ON}" \
 %if 0%{?rhel} == 5