Sync from SUSE:SLFO:Main jack revision 87990361929941b4245b7f5b0adad5fa

jack.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Apr 11 09:20:55 UTC 2024 - pgajdos@suse.com
+
+- remove dependency on /usr/bin/python3 using
+  %python3_fix_shebang macro, [bsc#1212476]
+
+-------------------------------------------------------------------
+Fri May 19 17:26:12 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Provide jack-daemon as an implementation-agnostic virtual name.
+- Split jackdbus into a separate jack-dbus package.
+
 -------------------------------------------------------------------
 Thu Mar 30 07:51:34 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

jack.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jack
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -51,7 +51,10 @@ BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sndfile)
+Requires:       jack-dbus
+Conflicts:      jack-daemon
 Provides:       jack-audio-connection-kit
+Provides:       jack-daemon
 Provides:       jack2 = %{version}
 Obsoletes:      jack2 < %{version}
 
@@ -68,6 +71,17 @@ has support for distributing audio processing across a
 network, both fast & reliable LANs as well as slower, less
 reliable WANs.
 
+%if 0%{?wdbus} == 1
+%package dbus
+Summary:        Jack Audio Connection Kit D-Bus support
+Group:          System/Sound Daemons
+Requires:       jack-daemon
+
+%description dbus
+This package contains the D-Bus support for JACK
+(Jack Audio ConnectionKit).
+%endif
+
 %package -n libjack%{sonum}
 Summary:        Jack Audio Connection Kit Library
 Group:          System/Libraries
@@ -81,8 +95,8 @@ This package contains the library to access JACK
 
 %package -n libjacknet%{sonum}
 Summary:        Jack Audio Connection Kit Library
-# libjacknet was packaged with libjack0 prior to 1.9.12
 Group:          System/Libraries
+# libjacknet was packaged with libjack0 prior to 1.9.12
 Conflicts:      libjack0 < 1.9.12
 Provides:       libjack0:%{_libdir}/libjacknet.so.%{sonum}*
 
@@ -92,8 +106,8 @@ This package contains the library to access JACK
 
 %package -n libjackserver%{sonum}
 Summary:        Jack Audio Connection Kit Library
-# libjackserver was packaged with libjack0 prior to 1.9.12
 Group:          System/Libraries
+# libjackserver was packaged with libjack0 prior to 1.9.12
 Conflicts:      libjack0 < 1.9.12
 Provides:       libjack0:%{_libdir}/libjackserver.so.%{sonum}*
 
@@ -121,9 +135,6 @@ communicate with jack clients/servers.
 %setup -q -n %{name}2-%{version}
 %autopatch -p1
 
-#Change python script headers to python3
-for i in `grep -rl "%{_bindir}/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
-
 %build
 %define _lto_cflags %{nil}
 export CFLAGS="%{optflags} -ggdb -fPIC"
@@ -156,6 +167,7 @@ mv %{buildroot}%{_datadir}/jack-audio-connection-kit %{buildroot}%{_docdir}
 %endif
 
 %fdupes -s %{buildroot}%{_docdir}
+%python3_fix_shebang
 
 %post -n libjack%{sonum} -p /sbin/ldconfig
 %postun -n libjack%{sonum} -p /sbin/ldconfig
@@ -169,6 +181,8 @@ mv %{buildroot}%{_datadir}/jack-audio-connection-kit %{buildroot}%{_docdir}
 %license COPYING
 %{_mandir}/man1/*
 %{_bindir}/*
+%exclude %{_bindir}/jackdbus
+%exclude %{_bindir}/jack_control
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/%{name}_alsa.so
 %{_libdir}/%{name}/%{name}_dummy.so
@@ -182,7 +196,11 @@ mv %{buildroot}%{_datadir}/jack-audio-connection-kit %{buildroot}%{_docdir}
 %{_libdir}/%{name}/jack_alsarawmidi.so
 %{_libdir}/%{name}/%{name}_firewire.so
 %{_libdir}/%{name}/%{name}_proxy.so
+
 %if 0%{?wdbus} == 1
+%files dbus
+%{_bindir}/jackdbus
+%{_bindir}/jack_control
 %{_datadir}/dbus-1/services/org.jackaudio.service
 %endif