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

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

1 files changed, 33 insertions, 6 deletions

diff --git a/redhat/applications/multimedia/rosegarden/rosegarden.spec b/redhat/applications/multimedia/rosegarden/rosegarden.spec
index 3e6834a7f..99fb2abbb 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.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg rosegarden
 %define tde_prefix /opt/trinity
@@ -81,28 +81,51 @@ BuildRequires:	brp-check-trinity
 %endif
 
 BuildRequires:	fftw-devel
-BuildRequires:	liblo-devel
 BuildRequires:	fontconfig-devel
 
+# LO support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}lo-devel
+%else
+BuildRequires:	liblo-devel
+%endif
+
 # DSSI support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	dssi-devel
 %endif
 
 # LRDF support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}lrdf-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	liblrdf-devel
 %endif
 
+# LADSPA support
+%if 0%{?mdkver}
+BuildRequires:	ladspa-devel
+%endif
+
+# RAPTOR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}raptor-devel
+%endif
+
 # JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	%{_lib}jack-devel
 %else
 BuildRequires:	jack-audio-connection-kit-devel
 %endif
 
 # ACL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # LIRC support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
@@ -134,7 +157,11 @@ Requires:		libsndfile-utils
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -177,7 +204,7 @@ This package provides the data files necessary for running Rosegarden
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-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