From c34960529cde4e1c5721191d897761f059c35748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Wed, 17 Apr 2024 19:16:43 +0200
Subject: RPM: lots of updates for Trinity 14.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/dependencies/akode/akode.spec       | 2 +-
 redhat/dependencies/arts/arts.spec         | 6 +++---
 redhat/dependencies/sip4-tqt/sip4-tqt.spec | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'redhat/dependencies')

diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index 7cc92149a..c6b070cab 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -83,7 +83,7 @@ BuildRequires: flac-devel
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_jack --with-jack
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libjack-devel
+BuildRequires: %{_lib}jack-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: jack-audio-connection-kit-devel
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 9846dcedd..fd50cb40d 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -78,7 +78,7 @@ BuildRequires:	gsl-devel
 BuildRequires:	libvorbis-devel
 
 # ESOUND support
-%define with_esound 1
+#define with_esound 1
 %if 0%{?with_esound}
 BuildRequires:	esound-devel
 %endif
@@ -271,8 +271,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
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 7dae151e8..4f4496ad1 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -80,7 +80,6 @@ BuildRequires:	flex
 %if "%{python}" == ""
 %global python python3
 %endif
-%global __python %__python3
 %global python_sitearch %{python3_sitearch}
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
-- 
cgit v1.2.1