From 14143661eadcd63003afb41aea63114608894804 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy@fedoraproject.org>
Date: Nov 21 2009 20:00:29 +0000
Subject: Update to 0.118.0 (fix #533419)


---

diff --git a/.cvsignore b/.cvsignore
index 1865750..6e87eb9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jack-audio-connection-kit-0.116.1.tar.gz
+jack-audio-connection-kit-0.118.0.tar.gz
diff --git a/jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch b/jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch
deleted file mode 100644
index 47bcf78..0000000
--- a/jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- jack-audio-connection-kit-0.116.1/libjack/client.c.cleanup-mb-thread	2009-11-04 14:48:04.686074485 -0500
-+++ jack-audio-connection-kit-0.116.1/libjack/client.c	2009-11-04 14:48:40.198074109 -0500
-@@ -970,6 +970,7 @@ jack_client_open_aux (const char *client
- 	/* validate parameters */
- 	if ((options & ~JackOpenOptions)) {
- 		*status |= (JackFailure|JackInvalidOption);
-+		jack_messagebuffer_exit ();
- 		return NULL;
- 	}
- 
-@@ -984,6 +985,7 @@ jack_client_open_aux (const char *client
- 	*/
- 	if (jack_get_tmpdir ()) {
- 		*status |= JackFailure;
-+		jack_messagebuffer_exit ();
- 		return NULL;
- 	}
- 
-@@ -994,6 +996,7 @@ jack_client_open_aux (const char *client
- 
- 	if (jack_request_client (ClientExternal, client_name, options, status,
- 				 &va, &res, &req_fd)) {
-+		jack_messagebuffer_exit ();
- 		return NULL;
- 	}
- 
-@@ -1088,6 +1091,8 @@ jack_client_open_aux (const char *client
-  	return client;
- 	
-   fail:
-+	jack_messagebuffer_exit ();
-+
- 	if (client->engine) {
- 		jack_release_shm (&client->engine_shm);
- 		client->engine = 0;
diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 9228289..7d50600 100644
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -1,6 +1,6 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 0.116.2
+Version: 0.118.0
 Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Daemons
@@ -9,7 +9,6 @@ Source1: %{name}-README.Fedora
 Source2: %{name}-script.pa
 Source3: %{name}-no_date_footer.html
 Source4: %{name}-limits.conf
-Patch0: jack-audio-connection-kit-0.116.1-cleanup-mb-thread.patch
 URL: http://www.jackaudio.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -65,8 +64,6 @@ Small example clients that use the Jack Audio Connection Kit.
 %prep
 %setup -q
 
-%patch0 -p1 -b .cleanup-mb-thread
-
 # Put custom HTML_FOOTER to avoid timestamp inside
 # (recipe was taken from http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks)
 cp %{SOURCE3} doc/no_date_footer.html
@@ -158,14 +155,18 @@ exit 0
 %defattr(-,root,root)
 %{_bindir}/jackrec
 %{_bindir}/jack_alias
+%{_bindir}/jack_bufsize
 %{_bindir}/jack_connect
 %{_bindir}/jack_disconnect
 %{_bindir}/jack_evmon
 %{_bindir}/jack_impulse_grabber
 %{_bindir}/jack_lsp
 %{_bindir}/jack_metro
+%{_bindir}/jack_netsource
+%{_bindir}/jack_samplerate
 %{_bindir}/jack_showtime
 %{_bindir}/jack_transport
+%{_bindir}/jack_wait
 %{_bindir}/jack_monitor_client
 %{_bindir}/jack_simple_client
 %{_bindir}/jack_transport_client
@@ -173,6 +174,11 @@ exit 0
 %{_bindir}/jack_midisine
 
 %changelog
+* Sat Nov 21 2009 Andy Shevchenko <andy@smile.org.ua> - 0.118.0-1
+- update to 0.118.0 (should fix #533419)
+- remove upstreamed patch
+- append new binaries to -example-clients subpackage
+
 * Wed Nov  4 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 0.116.2-8
 - update to 0.116.2
 - make sure we cleanup threads that we open, fixes segfaults (thanks to Ray Strode)
diff --git a/sources b/sources
index e5113ba..e5be2fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c0ae9880e9b6e081f1a238fe6a28bd5  jack-audio-connection-kit-0.116.2.tar.gz
+d58e29a55f285d54e75134cec8e02a10  jack-audio-connection-kit-0.118.0.tar.gz