- updated to 1.9.22

- example tools and clients (including jack_rec) moved to jack-example-tools.spec

diff --git a/jack-audio-connection-kit.spec b/jack-audio-connection-kit.spec
index 386427474c9524745ab5bfb4f731e8decc823605..24a12db411aa48651fbd387bebed9c4a532fce31 100644 (file)
--- a/jack-audio-connection-kit.spec
+++ b/jack-audio-connection-kit.spec
@@ -3,47 +3,39 @@
 # Conditional build:
 %bcond_without apidocs         # Doxygen docs
 %bcond_without ffado           # firewire (FFADO) driver
-%bcond_without zalsa           # zita-a2j/j2a client
 %bcond_with    classic         # build also classic jackd server (see http://trac.jackaudio.org/wiki/JackDbusPackaging)
 
 Summary:       The JACK Audio Connection Kit
 Summary(pl.UTF-8):     JACK - zestaw do połączeń audio
 Name:          jack-audio-connection-kit
-Version:       1.9.21
+Version:       1.9.22
 Release:       1
 License:       LGPL v2.1+ (libjack), GPL v2+ (the rest)
 Group:         Daemons
 #Source0Download: https://jackaudio.org/downloads/
 #Source0:      https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
 Source0:       https://github.com/jackaudio/jack2/archive/v%{version}/jack2-%{version}.tar.gz
-# Source0-md5: 48515d41a3e8de2464efc583d2b9a596
+# Source0-md5: e57c8ad3de75f78b6eb7aacea4e25755
 URL:           https://jackaudio.org/
 BuildRequires: alsa-lib-devel >= 1.0.18
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake
 BuildRequires: celt-devel >= 0.11.0
 BuildRequires: dbus-devel >= 1.0.0
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: expat-devel
 %{?with_ffado:BuildRequires:   libffado-devel >= 1.999.17}
 BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: readline-devel
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 # with opus_custom interface
 BuildRequires: opus-devel >= 1.0.3-2
 %{?with_apidocs:BuildRequires: texlive-pdftex}
-%if %{with zalsa}
-BuildRequires: zita-alsa-pcmi-devel
-BuildRequires: zita-resampler-devel
-%endif
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      alsa-lib >= 1.0.18
 Obsoletes:     jack-audio-connection-kit-driver-alsa < 0.101.1-2
 Obsoletes:     jack-audio-connection-kit-driver-iec61883 < 0.99.0
+Obsoletes:     jack-audio-connection-kit-example-jackrec < 1.9.22
 Obsoletes:     jack-audio-connection-kit-static < 1.9.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -130,35 +122,6 @@ FireWire (FFADO) sound driver for JACK.
 %description driver-firewire -l pl.UTF-8
 Sterownik dźwięku FireWire (FFADO) dla JACK-a.
 
-%package example-clients
-Summary:       Example clients that use JACK
-Summary(pl.UTF-8):     Przykładowe programy klienckie używające JACK-a
-License:       GPL v2+
-Group:         Applications/Sound
-Requires:      %{name} = %{version}-%{release}
-
-%description example-clients
-Small example clients that use the JACK Audio Connection Kit.
-
-%description example-clients -l pl.UTF-8
-Małe, przykładowe programy klienckie, które używają zestawu do
-połączeń audio JACK.
-
-%package example-jackrec
-Summary:       Example JACK client: jackrec
-Summary(pl.UTF-8):     Przykładowy klient zestawu JACK: jackrec
-License:       GPL v2+
-Group:         Applications/Sound
-Requires:      %{name} = %{version}-%{release}
-
-%description example-jackrec
-Example JACK client: jackrec. It's separated because it uses
-libsndfile library.
-
-%description example-jackrec -l pl.UTF-8
-Przykładowy klient zestawu JACK: jackrec. Jest wydzielony, ponieważ
-wymaga biblioteki libsndfile.
-
 %prep
 %setup -q -n jack2-%{version}
 
@@ -171,7 +134,6 @@ export LINKFLAGS="%{rpmldflags}"
 ./waf configure -j1 \
        -v \
        %{?debug:--debug} \
-       --example-tools \
        --prefix=%{_prefix} \
        --libdir=%{_libdir} \
        --htmldir=%{_gtkdocdir}/%{name}/reference \
@@ -179,8 +141,7 @@ export LINKFLAGS="%{rpmldflags}"
        %{?with_classic:--classic} \
        --dbus \
        %{?with_apidocs:--doxygen} \
-       %{?with_ffado:--firewire} \
-       %{!?with_zalsa:--no-zalsa}
+       %{?with_ffado:--firewire}
 
 ./waf build %{?_smp_mflags} -v
 
@@ -192,12 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
 
-# For compatibility with jack1
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
-
 # not built or packaged
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/jack_impulse_grabber.1 \
-       %{!?with_classic:$RPM_BUILD_ROOT%{_mandir}/man1/jackd.1}
+%if %{without classic}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/jackd.1
+%endif
 
 # fix perms (needed for autorequires/provides)
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
@@ -217,20 +176,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS.rst ChangeLog.rst README*
-%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_evmon
-%attr(755,root,root) %{_bindir}/jack_iodelay
-%attr(755,root,root) %{_bindir}/jack_load
-%attr(755,root,root) %{_bindir}/jack_midi_dump
-%attr(755,root,root) %{_bindir}/jack_net_master
-%attr(755,root,root) %{_bindir}/jack_net_slave
-%attr(755,root,root) %{_bindir}/jack_server_control
-%attr(755,root,root) %{_bindir}/jack_session_notify
-%attr(755,root,root) %{_bindir}/jack_simdtests
-%attr(755,root,root) %{_bindir}/jack_test
-%attr(755,root,root) %{_bindir}/jack_unload
 %{?with_classic:%attr(755,root,root) %{_bindir}/jackd}
 %attr(755,root,root) %{_bindir}/jackdbus
 %dir %{_libdir}/jack
@@ -245,15 +191,8 @@ fi
 %attr(755,root,root) %{_libdir}/jack/netadapter.so
 %attr(755,root,root) %{_libdir}/jack/netmanager.so
 %attr(755,root,root) %{_libdir}/jack/profiler.so
-%if %{with zalsa}
-%attr(755,root,root) %{_libdir}/jack/zalsa_in.so
-%attr(755,root,root) %{_libdir}/jack/zalsa_out.so
-%endif
 %{_datadir}/dbus-1/services/org.jackaudio.service
 %{?with_classic:%{_mandir}/man1/jackd.1*}
-%{_mandir}/man1/jack_iodelay.1*
-%{_mandir}/man1/jack_load.1*
-%{_mandir}/man1/jack_unload.1*
 
 %files libs
 %defattr(644,root,root,755)
@@ -283,53 +222,3 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/jack/jack_firewire.so
 %endif
-
-%files example-clients
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/alsa_in
-%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_midi_latency_test
-%attr(755,root,root) %{_bindir}/jack_midiseq
-%attr(755,root,root) %{_bindir}/jack_midisine
-%attr(755,root,root) %{_bindir}/jack_monitor_client
-%attr(755,root,root) %{_bindir}/jack_multiple_metro
-%attr(755,root,root) %{_bindir}/jack_netsource
-%attr(755,root,root) %{_bindir}/jack_property
-%attr(755,root,root) %{_bindir}/jack_samplerate
-%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*
-%{_mandir}/man1/jack_bufsize.1*
-%{_mandir}/man1/jack_connect.1*
-%{_mandir}/man1/jack_disconnect.1*
-%{_mandir}/man1/jack_freewheel.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*
-
-%files example-jackrec
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/jackrec
-%{_mandir}/man1/jackrec.1*