packages: jack-audio-connection-kit/jack-audio-connection-kit.spec - merged...

[qboosh]

Author: qboosh                       Date: Sun Jun 19 16:39:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged some changes from JACK_0 branch:
  - updated versioned dependencies (alsa-lib, celt, libffado)
  - renamed firewire bcond to ffado (there are another firewire backends, freebob is also one)
  - moved some less useful example clients (cpu_load,latent_client,thru,zombie) to -example-clients

---- Files affected:
packages/jack-audio-connection-kit:
   jack-audio-connection-kit.spec (1.92 -> 1.93) 

---- Diffs:

================================================================
Index: packages/jack-audio-connection-kit/jack-audio-connection-kit.spec
diff -u packages/jack-audio-connection-kit/jack-audio-connection-kit.spec:1.92 packages/jack-audio-connection-kit/jack-audio-connection-kit.spec:1.93
--- packages/jack-audio-connection-kit/jack-audio-connection-kit.spec:1.92	Sat Apr 30 17:33:28 2011
+++ packages/jack-audio-connection-kit/jack-audio-connection-kit.spec	Sun Jun 19 18:39:48 2011
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# don't generate documentation with doxygen
-%bcond_without	firewire	# build FFADO driver
+%bcond_without	ffado		# don't build firewire (FFADO) driver
 %bcond_without	freebob		# don't build freebob driver
 %bcond_with	classic		# build also classic jackd server (see http://trac.jackaudio.org/wiki/JackDbusPackaging)
 #
@@ -18,16 +18,18 @@
 Patch0:		jack-freebob-buildfix.patch
 Patch1:		jack-doxygen-output-dirs.patch
 URL:		http://jackaudio.org/
-BuildRequires:	alsa-lib-devel >= 0.9.0
+BuildRequires:	alsa-lib-devel >= 1.0.18
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	celt-devel
-BuildRequires:	dbus-devel
+BuildRequires:	celt-devel >= 0.5.0
+BuildRequires:	dbus-devel >= 1.0.0
 %{?with_apidocs:BuildRequires:	doxygen}
-%{?with_firewire:BuildRequires:	libffado-devel}
+BuildRequires:	expat-devel
+%{?with_ffado:BuildRequires:	libffado-devel >= 1.999.17}
 %{?with_freebob:BuildRequires:	libfreebob-devel >= 1.0.0}
 BuildRequires:	libsamplerate-devel
 BuildRequires:	libsndfile-devel >= 1.0.0
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
@@ -69,6 +71,7 @@
 Summary(pl.UTF-8):	Biblioteka JACK-a
 License:	LGPL v2.1+
 Group:		Libraries
+Requires:	alsa-lib >= 1.0.18
 Conflicts:	jack-audio-connection-kit < 0.100.7
 
 %description libs
@@ -121,6 +124,7 @@
 License:	GPL v2+
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libffado >= 1.999.17
 
 %description driver-firewire
 FireWire (FFADO) sound driver for JACK.
@@ -134,6 +138,7 @@
 License:	GPL v2+
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libfreebob >= 1.0.0
 
 %description driver-freebob
 FreeBoB (BeBoB platform) sound driver for JACK.
@@ -143,7 +148,7 @@
 
 %package example-clients
 Summary:	Example clients that use JACK
-Summary(pl.UTF-8):	Przykładowe programy kliencie używające JACK-a
+Summary(pl.UTF-8):	Przykładowe programy klienckie używające JACK-a
 License:	GPL v2+
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
@@ -190,7 +195,7 @@
 	--dbus \
 	%{?with_classic:--classic} \
 	%{?with_apidocs:--doxygen} \
-	%{?with_firewire:--firewire} \
+	%{?with_ffado:--firewire} \
 	%{?with_freebob:--freebob} \
 	--alsa
 
@@ -229,18 +234,14 @@
 %attr(755,root,root) %{_bindir}/jack_alias
 %attr(755,root,root) %{_bindir}/jack_control
 %attr(755,root,root) %{_bindir}/jack_cpu
-%attr(755,root,root) %{_bindir}/jack_cpu_load
 %attr(755,root,root) %{_bindir}/jack_evmon
 %attr(755,root,root) %{_bindir}/jack_iodelay
-%attr(755,root,root) %{_bindir}/jack_latent_client
 %attr(755,root,root) %{_bindir}/jack_load
 %attr(755,root,root) %{_bindir}/jack_midi_dump
 %attr(755,root,root) %{_bindir}/jack_server_control
 %attr(755,root,root) %{_bindir}/jack_session_notify
 %attr(755,root,root) %{_bindir}/jack_test
-%attr(755,root,root) %{_bindir}/jack_thru
 %attr(755,root,root) %{_bindir}/jack_unload
-%attr(755,root,root) %{_bindir}/jack_zombie
 %{?with_classic:%attr(755,root,root) %{_bindir}/jackd}
 %attr(755,root,root) %{_bindir}/jackdbus
 %dir %{_libdir}/jack
@@ -279,7 +280,7 @@
 %{_gtkdocdir}/%{name}
 %endif
 
-%if %{with firewire}
+%if %{with ffado}
 %files driver-firewire
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/jack/jack_firewire.so
@@ -297,8 +298,10 @@
 %attr(755,root,root) %{_bindir}/alsa_out
 %attr(755,root,root) %{_bindir}/jack_bufsize
 %attr(755,root,root) %{_bindir}/jack_connect
+%attr(755,root,root) %{_bindir}/jack_cpu_load
 %attr(755,root,root) %{_bindir}/jack_disconnect
 %attr(755,root,root) %{_bindir}/jack_freewheel
+%attr(755,root,root) %{_bindir}/jack_latent_client
 %attr(755,root,root) %{_bindir}/jack_lsp
 %attr(755,root,root) %{_bindir}/jack_metro
 %attr(755,root,root) %{_bindir}/jack_midiseq
@@ -310,8 +313,10 @@
 %attr(755,root,root) %{_bindir}/jack_showtime
 %attr(755,root,root) %{_bindir}/jack_simple_client
 %attr(755,root,root) %{_bindir}/jack_simple_session_client
+%attr(755,root,root) %{_bindir}/jack_thru
 %attr(755,root,root) %{_bindir}/jack_transport
 %attr(755,root,root) %{_bindir}/jack_wait
+%attr(755,root,root) %{_bindir}/jack_zombie
 %attr(755,root,root) %{_libdir}/jack/inprocess.so
 %{_mandir}/man1/alsa_in.1*
 %{_mandir}/man1/alsa_out.1*
@@ -340,6 +345,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2011/06/19 16:39:48  qboosh
+- merged some changes from JACK_0 branch:
+  - updated versioned dependencies (alsa-lib, celt, libffado)
+  - renamed firewire bcond to ffado (there are another firewire backends, freebob is also one)
+  - moved some less useful example clients (cpu_load,latent_client,thru,zombie) to -example-clients
+
 Revision 1.92  2011/04/30 15:33:28  megabajt
 - set executable bit for libraries / modules so that rpm generates autorequires
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jack-audio-connection-kit/jack-audio-connection-kit.spec?r1=1.92&r2=1.93&f=u