Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -13,3 +13,4 @@ jack-1.9.5.tar.bz2
 /jack2-1.9.19.tar.gz
 /jack2-1.9.20.tar.gz
 /jack2-1.9.21.tar.gz
+/jack2-1.9.22.tar.gz

jack-audio-connection-kit.spec

@@ -13,8 +13,8 @@
 
 Summary:       The Jack Audio Connection Kit
 Name:          jack-audio-connection-kit
-Version:       1.9.21
-Release:       1%{?dist}
+Version:       1.9.22
+Release:       6%{?dist}
 # The entire source (~500 files) is a mixture of these three licenses
 License:       GPLv2 and GPLv2+ and LGPLv2+
 URL:           https://www.jackaudio.org
@@ -22,6 +22,8 @@ Source0:       https://github.com/jackaudio/jack2/archive/v%{version}/v%{version
 Source1:       %{name}-README.Fedora
 Source2:       %{name}-script.pa
 Source3:       %{name}-limits.conf
+# Build with Python >= 3.12
+Patch0:        jack2-py312.patch
 # Adjust default priority. RHBZ#795094
 Patch1:        jack-realtime-compat.patch
 
@@ -43,15 +45,12 @@ BuildRequires: ncurses-devel
 BuildRequires: opus-devel
 BuildRequires: pkgconfig
 BuildRequires: python3
-BuildRequires: readline-devel
-%if 0%{?fedora}
-BuildRequires: zita-alsa-pcmi-devel
-BuildRequires: zita-resampler-devel
-%endif
 
 Requires(pre): shadow-utils
 Requires:      pam
 
+Obsoletes:     %{name}-example-clients < 1.9.22
+
 %description
 JACK is a low-latency audio server, written primarily for the Linux operating
 system. It can connect a number of different applications to an audio device, as
@@ -105,11 +104,7 @@ python3 ./waf configure \
 %endif
    --alsa \
    --clients 256 \
-   --ports-per-application=2048 \
-%if 0%{?fedora}
-   --zalsa=yes \
-%endif
-   --example-tools=yes
+   --ports-per-application=2048
 
 python3 ./waf build %{?_smp_mflags} -v
 
@@ -131,9 +126,6 @@ install -p -m644 %{SOURCE1} README.Fedora
 # install pulseaudio script for jack (as documentation part)
 install -p -m644 %{SOURCE2} jack.pa
 
-# For compatibility with jack1
-mv %{buildroot}%{_bindir}/jack_rec %{buildroot}%{_bindir}/jackrec
-
 # Fix permissions of the modules
 chmod 755 %{buildroot}%{_libdir}/jack/*.so %{buildroot}%{_libdir}/libjack*.so.*.*.*
 
@@ -147,14 +139,12 @@ exit 0
 %doc jack.pa
 %license COPYING
 %{_bindir}/jackd
-%{_bindir}/jackrec
 %{_libdir}/jack/
 %{_libdir}/libjack.so.0*
 %{_libdir}/libjacknet.so.0*
 %{_libdir}/libjackserver.so.0*
 %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
 
-%{_mandir}/man1/jackrec.1*
 %{_mandir}/man1/jackd*.1*
 
 %files dbus
@@ -170,74 +160,35 @@ exit 0
 %{_libdir}/libjackserver.so
 %{_libdir}/pkgconfig/jack.pc
 
-%files example-clients
-%license COPYING
-%{_bindir}/alsa_in
-%{_bindir}/alsa_out
-%{_bindir}/jack_alias
-%{_bindir}/jack_bufsize
-%{_bindir}/jack_connect
-%{_bindir}/jack_disconnect
-%{_bindir}/jack_cpu_load
-%{_bindir}/jack_evmon
-%{_bindir}/jack_freewheel
-# These are not ready yet
-#{_bindir}/jack_impulse_grabber
-%exclude %{_mandir}/man1/jack_impulse_grabber.1*
-%{_bindir}/jack_latent_client
-%{_bindir}/jack_load
-%{_bindir}/jack_unload
-%{_bindir}/jack_lsp
-%{_bindir}/jack_metro
-%{_bindir}/jack_midi_dump
-%{_bindir}/jack_midi_latency_test
-%{_bindir}/jack_midiseq
-%{_bindir}/jack_midisine
-%{_bindir}/jack_monitor_client
-%{_bindir}/jack_net_master
-%{_bindir}/jack_net_slave
-%{_bindir}/jack_netsource
-%{_bindir}/jack_property
-%{_bindir}/jack_samplerate
-%{_bindir}/jack_server_control
-%{_bindir}/jack_session_notify
-%{_bindir}/jack_showtime
-%{_bindir}/jack_simple_client
-%{_bindir}/jack_simple_session_client
-%{_bindir}/jack_thru
-%{_bindir}/jack_transport
-%{_bindir}/jack_wait
-%{_bindir}/jack_zombie
-
-%{_mandir}/man1/alsa_*.1*
-%{_mandir}/man1/jack_bufsize.1*
-%{_mandir}/man1/jack_connect.1*
-%{_mandir}/man1/jack_disconnect.1*
-%{_mandir}/man1/jack_freewheel*.1*
-%{_mandir}/man1/jack_load*.1*
-%{_mandir}/man1/jack_unload*.1*
-%{_mandir}/man1/jack_lsp.1*
-%{_mandir}/man1/jack_metro.1*
-%{_mandir}/man1/jack_monitor_client.1*
-%{_mandir}/man1/jack_netsource.1*
-%{_mandir}/man1/jack_property.1*
-%{_mandir}/man1/jack_samplerate.1*
-%{_mandir}/man1/jack_showtime.1*
-%{_mandir}/man1/jack_simple_client.1*
-%{_mandir}/man1/jack_transport.1*
-%{_mandir}/man1/jack_wait.1*
-
-# tests
-%{_bindir}/jack_cpu
-%{_bindir}/jack_iodelay
-%{_bindir}/jack_multiple_metro
-%{_bindir}/jack_simdtests
-%{_bindir}/jack_test
-
-%{_mandir}/man1/jack_iodelay.1*
+%changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.22-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.22-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jul 25 2023 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.22-3
+- Fix build against Python >= 3.12
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Feb 05 2023 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.22-1
+- Update to 1.9.22
+- Obsolete example clients package
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.21-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Aug 12 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.21-3
+- Fix FTBFS with python 3.11
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-%changelog
 * Thu Apr 21 2022 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.21-1
 - Update to 1.9.21
 

jack2-py312.patch

@@ -0,0 +1,26 @@
+diff -rupN jack2-1.9.22.old/waflib/Context.py jack2-1.9.22/waflib/Context.py
+--- jack2-1.9.22.old/waflib/Context.py	2023-02-02 06:04:10.000000000 -0500
++++ jack2-1.9.22/waflib/Context.py	2023-07-25 22:30:59.255028763 -0400
+@@ -6,7 +6,9 @@
+ Classes and functions enabling the command system
+ """
+ 
+-import os, re, imp, sys
++import os, re, sys
++import importlib.util
++import importlib.machinery
+ from waflib import Utils, Errors, Logs
+ import waflib.Node
+ 
+@@ -660,7 +662,10 @@ def load_module(path, encoding=None):
+ 	except KeyError:
+ 		pass
+ 
+-	module = imp.new_module(WSCRIPT_FILE)
++	loader = importlib.machinery.SourceFileLoader(WSCRIPT_FILE, WSCRIPT_FILE)
++	spec = importlib.util.spec_from_loader(loader.name, loader)
++	module = importlib.util.module_from_spec(spec)
++	loader.exec_module(module)
+ 	try:
+ 		code = Utils.readf(path, m='r', encoding=encoding)
+ 	except EnvironmentError:

sources

@@ -1 +1 @@
-SHA512 (jack2-1.9.21.tar.gz) = 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
+SHA512 (jack2-1.9.22.tar.gz) = d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4