From de6e13eef4e57f0f5c3e2fd969a6cd032b9d7ee5 Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi@gmail.com>
Date: Thu, 21 Apr 2022 20:48:32 +0200
Subject: [PATCH] Update to 1.9.21

---
 .gitignore                                    |  1 +
 ...nnection-kit-example-tools-man-pages.patch | 27 -------------------
 jack-audio-connection-kit.spec                |  9 ++++---
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 jack-audio-connection-kit-example-tools-man-pages.patch

diff --git a/.gitignore b/.gitignore
index d0b422f..e4f2965 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ jack-1.9.5.tar.bz2
 /jack2-1.9.18.tar.gz
 /jack2-1.9.19.tar.gz
 /jack2-1.9.20.tar.gz
+/jack2-1.9.21.tar.gz
diff --git a/jack-audio-connection-kit-example-tools-man-pages.patch b/jack-audio-connection-kit-example-tools-man-pages.patch
deleted file mode 100644
index 8b37eb0..0000000
--- a/jack-audio-connection-kit-example-tools-man-pages.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f653c2d8e90a821538ae6fab68dccf4015c2d64f Mon Sep 17 00:00:00 2001
-From: Guido Aulisi <guido.aulisi@gmail.com>
-Date: Sun, 16 Jan 2022 21:24:18 +0100
-Subject: [PATCH] Fix build of jack-example-tools man pages
-
-Commit e8c0be1ce932bfb99fdd1a50e08fab187efed6ca changed the name
-of the configuration environment to build the jack-example-tools,
-but forgot to change it for man pages.
----
- man/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/wscript b/man/wscript
-index 52270c33..691b05ab 100644
---- a/man/wscript
-+++ b/man/wscript
-@@ -5,6 +5,6 @@
- def build(bld):
-     bld.exec_command('cd man ; sh fill_template {} {}'.format(
-         bld.env['JACK_VERSION'],
--        bld.env['HAVE_JACK_EXAMPLE_TOOLS'])
-+        bld.env['BUILD_JACK_EXAMPLE_TOOLS'])
-     )
-     bld.install_files(bld.env['MANDIR'], bld.path.ant_glob('*.1'))
--- 
-2.34.1
-
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index d0d56e2..283204f 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -13,8 +13,8 @@
 
 Summary:       The Jack Audio Connection Kit
 Name:          jack-audio-connection-kit
-Version:       1.9.20
-Release:       2%{?dist}
+Version:       1.9.21
+Release:       1%{?dist}
 # The entire source (~500 files) is a mixture of these three licenses
 License:       GPLv2 and GPLv2+ and LGPLv2+
 URL:           https://www.jackaudio.org
@@ -24,8 +24,6 @@ Source2:       %{name}-script.pa
 Source3:       %{name}-limits.conf
 # Adjust default priority. RHBZ#795094
 Patch1:        jack-realtime-compat.patch
-# Patch sent upstream https://github.com/jackaudio/jack2/pull/836
-Patch2:        %{name}-example-tools-man-pages.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: dbus-devel
@@ -240,6 +238,9 @@ exit 0
 
 
 %changelog
+* Thu Apr 21 2022 Guido Aulisi <guido.aulisi@gmail.com> - 1.9.21-1
+- Update to 1.9.21
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index e8382a2..a7960eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jack2-1.9.20.tar.gz) = e4bffea5fadcf6fc8a40bb88b6f7266bc42d8fa743d5e00be786df00b19b9e02e42ce6cb5db3a9523eb3b2bc319234ac33c00b2c1e2ac7d1c875890d55da30b4
+SHA512 (jack2-1.9.21.tar.gz) = 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557