1 files changed, 27 insertions, 10 deletions
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 5e7809a97..5b1ecb63a 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -22,7 +22,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 arts
 %define tde_prefix /opt/trinity
@@ -72,13 +72,27 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
 BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
+
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# ALSA support
+%if 0%{?mdkver}
+%define alsa_devel %{_lib}asound-devel
+%else
+%define alsa_devel alsa-lib-devel
+%endif
+BuildRequires: %{alsa_devel}
 
 # ESOUND support
-%define with_esound 1
+#define with_esound 1
 %if 0%{?with_esound}
 BuildRequires:	esound-devel
 %endif
@@ -117,6 +131,9 @@ BuildRequires:	libtool
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion}
 %define mad_devel libmad-devel
 %endif
+%if 0%{?mdkver}
+%define mad_devel %{_lib}mad-devel
+%endif
 BuildRequires:		%{mad_devel}
 %endif
 %endif
@@ -177,10 +194,10 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:	arts-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
-Requires:	alsa-lib-devel
+Requires:	%{alsa_devel}
 Requires:	audiofile-devel
-Requires:	libvorbis-devel
-%{?with_esound:Requires:	esound-devel}
+%{?libvorbis_devel:Requires: %{libvorbis_devel}}
+%{?with_esound:Requires: esound-devel}
 %{?with_libmad:Requires: %{mad_devel}}
 %{?with_jack:Requires: %{jack_devel}}
 
@@ -244,7 +261,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-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
@@ -271,8 +288,8 @@ fi
   -DWITH_AUDIOFILE=ON \
   -DWITH_VORBIS=ON \
   %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
-  %{?with_esound:-DWITH_ESOUND=ON} \
-  %{?with_jack:-DWITH_JACK=ON} \
+  %{?with_esound:-DWITH_ESOUND=ON} %{!?with_esound:-DWITH_ESOUND=OFF} \
+  %{?with_jack:-DWITH_JACK=ON} %{!?with_jack:-DWITH_JACK=OFF} \
   ..
 
 %__make %{?_smp_mflags} || %__make