Accepting request 939140 from home:alarrosa:branches:multimedia:libs

- Minor aesthetic changes in the spec file 

- Replace the Recommends wireplumber to a Suggests since there's
  already a Require dependency on a pipewire-session-manager and
  when in doubt the Suggested package is selected.

OBS-URL: https://build.opensuse.org/request/show/939140
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=31

pipewire.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 10 09:31:47 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
+
+- Minor aesthetic changes in the spec file 
+
 -------------------------------------------------------------------
 Thu Dec  9 12:14:23 UTC 2021 - Neal Gompa <ngompa@opensuse.org>
 
@@ -6,7 +11,9 @@ Thu Dec  9 12:14:23 UTC 2021 - Neal Gompa <ngompa@opensuse.org>
 -------------------------------------------------------------------
 Thu Dec  9 11:33:29 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
 
-- Replace the Recommends wireplumber to a Suggests
+- Replace the Recommends wireplumber to a Suggests since there's
+  already a Require dependency on a pipewire-session-manager and
+  when in doubt the Suggested package is selected.
 
 -------------------------------------------------------------------
 Thu Dec  9 10:34:27 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>

pipewire.spec

@@ -48,6 +48,10 @@
 %bcond_without aac
 %endif
 
+%if %{?pkg_vcmp:%{pkg_vcmp meson >= 0.59.0}}%{!?pkg_vcmp:0}
+%bcond_without pipewire_jack_devel
+%endif
+
 Name:           pipewire
 Version:        0.3.40
 Release:        0
@@ -357,7 +361,7 @@ export CC=gcc-9
 %endif
     -Dpipewire-jack=enabled \
     -Djack=enabled \
-%if %{?pkg_vcmp:%{pkg_vcmp meson >= 0.59.0}}%{!?pkg_vcmp:0}
+%if %{with pipewire_jack_devel}
     -Djack-devel=true \
 %else
     -Djack-devel=false \
@@ -491,12 +495,12 @@ fi
 %{_userunitdir}/pipewire.socket
 %{_mandir}/man1/pipewire.1%{ext_man}
 %{_mandir}/man5/pipewire.conf.5%{ext_man}
-%dir %{_datadir}/pipewire
+%dir %{_datadir}/pipewire/
 %{_datadir}/pipewire/pipewire.conf
 %{_datadir}/pipewire/client.conf
 %{_datadir}/pipewire/client-rt.conf
 %{_datadir}/pipewire/pipewire-pulse.conf
-%ghost %dir %{_localstatedir}/lib/pipewire
+%ghost %dir %{_localstatedir}/lib/pipewire/
 %ghost %{_localstatedir}/lib/pipewire/pipewire_post_workaround
 
 %files -n %{libpipewire}
@@ -523,8 +527,8 @@ fi
 %{_libdir}/pipewire-%{apiver}/jack/libjack.so
 %{_libdir}/pipewire-%{apiver}/jack/libjacknet.so
 %{_libdir}/pipewire-%{apiver}/jack/libjackserver.so
-%if %{?pkg_vcmp:%{pkg_vcmp meson >= 0.59.0}}%{!?pkg_vcmp:0}
+%if %{with pipewire_jack_devel}
-%{_includedir}/jack
+%{_includedir}/jack/
 %{_libdir}/pkgconfig/jack.pc
 %endif
 
@@ -590,12 +594,12 @@ fi
 %{_libdir}/pipewire-%{apiver}/libpipewire-module-pulse-tunnel.so
 %{_libdir}/pipewire-%{apiver}/libpipewire-module-zeroconf-discover.so
 %{_libdir}/pipewire-%{apiver}/libpipewire-module-rt.so
-%dir %{_libdir}/pipewire-%{apiver}/v4l2
+%dir %{_libdir}/pipewire-%{apiver}/v4l2/
 %{_libdir}/pipewire-%{apiver}/v4l2/libpw-v4l2.so
-%dir %{_datadir}/alsa-card-profile
+%dir %{_datadir}/alsa-card-profile/
-%dir %{_datadir}/alsa-card-profile/mixer
+%dir %{_datadir}/alsa-card-profile/mixer/
 %{_datadir}/alsa-card-profile/mixer/*
-%dir %{_datadir}/pipewire/filter-chain
+%dir %{_datadir}/pipewire/filter-chain/
 %{_datadir}/pipewire/filter-chain/demonic.conf
 %{_datadir}/pipewire/filter-chain/sink-dolby-surround.conf
 %{_datadir}/pipewire/filter-chain/sink-eq6.conf
@@ -639,30 +643,30 @@ fi
 %{_libdir}/spa-%{spa_ver}/videotestsrc/libspa-videotestsrc.so
 %{_libdir}/spa-%{spa_ver}/volume/libspa-volume.so
 
-%dir %{_libdir}/spa-%{spa_ver}
+%dir %{_libdir}/spa-%{spa_ver}/
-%dir %{_libdir}/spa-%{spa_ver}/alsa
+%dir %{_libdir}/spa-%{spa_ver}/alsa/
-%dir %{_libdir}/spa-%{spa_ver}/audioconvert
+%dir %{_libdir}/spa-%{spa_ver}/audioconvert/
-%dir %{_libdir}/spa-%{spa_ver}/audiomixer
+%dir %{_libdir}/spa-%{spa_ver}/audiomixer/
-%dir %{_libdir}/spa-%{spa_ver}/bluez5
+%dir %{_libdir}/spa-%{spa_ver}/bluez5/
-%dir %{_libdir}/spa-%{spa_ver}/control
+%dir %{_libdir}/spa-%{spa_ver}/control/
-%dir %{_libdir}/spa-%{spa_ver}/volume
+%dir %{_libdir}/spa-%{spa_ver}/volume/
-%dir %{_libdir}/spa-%{spa_ver}/ffmpeg
+%dir %{_libdir}/spa-%{spa_ver}/ffmpeg/
-%dir %{_libdir}/spa-%{spa_ver}/jack
+%dir %{_libdir}/spa-%{spa_ver}/jack/
 %if %{with libcamera}
-%dir %{_libdir}/spa-%{spa_ver}/libcamera
+%dir %{_libdir}/spa-%{spa_ver}/libcamera/
 %endif
-%dir %{_libdir}/spa-%{spa_ver}/support
+%dir %{_libdir}/spa-%{spa_ver}/support/
-%dir %{_libdir}/spa-%{spa_ver}/v4l2
+%dir %{_libdir}/spa-%{spa_ver}/v4l2/
-%dir %{_libdir}/spa-%{spa_ver}/videoconvert
+%dir %{_libdir}/spa-%{spa_ver}/videoconvert/
 %if %{with_vulkan}
-%dir %{_libdir}/spa-%{spa_ver}/vulkan
+%dir %{_libdir}/spa-%{spa_ver}/vulkan/
 %endif
-%dir %{_libdir}/spa-%{spa_ver}/audiotestsrc
+%dir %{_libdir}/spa-%{spa_ver}/audiotestsrc/
-%dir %{_libdir}/spa-%{spa_ver}/videotestsrc
+%dir %{_libdir}/spa-%{spa_ver}/videotestsrc/
-%dir %{_libdir}/spa-%{spa_ver}/test
+%dir %{_libdir}/spa-%{spa_ver}/test/
 
-%dir %{_datadir}/spa-%{spa_ver}
+%dir %{_datadir}/spa-%{spa_ver}/
-%dir %{_datadir}/spa-%{spa_ver}/bluez5
+%dir %{_datadir}/spa-%{spa_ver}/bluez5/
 %{_datadir}/spa-%{spa_ver}/bluez5/bluez-hardware.conf
 
 %files devel
@@ -673,8 +677,8 @@ fi
 %{_includedir}/spa-%{spa_ver}/
 
 %files doc
-%dir %{_datadir}/doc/pipewire
+%dir %{_datadir}/doc/pipewire/
-%{_datadir}/doc/pipewire/html
+%{_datadir}/doc/pipewire/html/
 
 %files pulseaudio
 %{_bindir}/pipewire-pulse
@@ -689,8 +693,8 @@ fi
 %dir %{_datadir}/alsa/alsa.conf.d
 %{_datadir}/alsa/alsa.conf.d/50-pipewire.conf
 %{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf
-%dir %{_sysconfdir}/alsa
+%dir %{_sysconfdir}/alsa/
-%dir %{_sysconfdir}/alsa/conf.d
+%dir %{_sysconfdir}/alsa/conf.d/
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pipewire.conf
 %config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf