From daa6896df60a36f96a9c47aa3b02e0f5b30d87db Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 10:35:07 +0100 Subject: [PATCH] update existing default.pa configuration on upgrade [release 15.0-3mamba;Thu Sep 02 2021] --- pulseaudio.spec | 55 ++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/pulseaudio.spec b/pulseaudio.spec index 880d12b..76c920f 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -5,7 +5,7 @@ %define majver %(echo %{version} | cut -d. -f 1-2) Name: pulseaudio Version: 15.0 -Release: 2mamba +Release: 3mamba Summary: Improved Linux sound server Group: System/Libraries Vendor: openmamba @@ -75,42 +75,6 @@ Requires: udev Requires(post): /usr/sbin/alternatives Obsoletes: pulseaudio-esound-compat < 15.0 -# ---{ pulseaudio 0.9.22 }--- - -# Have X11: yes -# Enable OSS Output: yes -# Enable OSS Wrapper: yes -# Enable Alsa: yes -# Enable Solaris: no -# Enable GLib 2.0: yes -# Enable Gtk+ 2.0: yes -# Enable GConf: yes -# Enable Avahi: yes -# Enable Jack: yes -# Enable Async DNS: yes -# Enable LIRC: yes -# Enable HAL: no -# Enable udev: yes -# Enable HAL->udev compat: yes -# Enable BlueZ: yes -# Enable TCP Wrappers: yes -# Enable libsamplerate: yes -# Enable IPv6: yes -# Enable OpenSSL (for Airtunes): yes -# Enable tdb: yes - -# TODO -# Enable gdbm: no -# Enable simple database: no - -# System User: pulse -# System Group: pulse -# Access Group: pulse-access -# Enable per-user EsounD socket: yes -# Force preopen: no -# Preopened modules: all - - %description PulseAudio is a sound server for Linux and other Unix like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -194,7 +158,6 @@ A compatibility script that allows applications to start PulseAudio with EsounD Summary: Bluetooth proximity support for the PulseAudio sound server Group: Applications/Multimedia Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -# TODO Requires: bluez http://www.kernel.org/pub/linux/bluetooth %description module-bluetooth PulseAudio is a sound server for Linux and other Unix like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). @@ -279,7 +242,6 @@ This contains the static library needed by %{name} based applications. #%patch0 -p1 %build -#:<< _EOF %meson \ -Dsystem_user="pulse" \ -Dsystem_group="pulse" \ @@ -307,6 +269,7 @@ touch -r man/pulse-client.conf.5.xml.in %{buildroot}%{_mandir}/man5/pulse-client touch -r man/pulse-daemon.conf.5.xml.in %{buildroot}%{_mandir}/man5/pulse-daemon.conf.5 mkdir -p %{buildroot}%{_localstatedir}/lib/pulse +mkdir -p %{buildroot}%{_sysconfdir}/pulse/default.pa.d # TODO Requires: http://download.gnome.org/sources/gdm #mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.pulse @@ -349,6 +312,16 @@ fi %posttrans sed -i "s|module-gconf|module-gsettings|" %{_sysconfdir}/pulse/default.pa +sed -i "s|^\(load-module module-rescue-streams\)|#\1|" %{_sysconfdir}/pulse/default.pa +grep -q default.pa.d %{_sysconfdir}/pulse/default.pa || { + cat >> %{_sysconfdir}/pulse/default.pa << _EOF + +### Allow including a default.pa.d directory, which if present, can be used +### for additional configuration snippets. +.nofail +.include /etc/pulse/default.pa.d +_EOF +} : %post -n lib%{name}-glib -p /sbin/ldconfig @@ -382,6 +355,7 @@ fi %dir %{_sysconfdir}/pulse %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa +%dir %{_sysconfdir}/pulse/default.pa.d %config(noreplace) %{_sysconfdir}/pulse/system.pa %config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf %attr(4755,root,root) %{_bindir}/pulseaudio @@ -556,6 +530,9 @@ fi #%{_libdir}/pulse-%{majver}/modules/*.a %changelog +* Thu Sep 02 2021 Silvan Calarco 15.0-3mamba +- update existing default.pa configuration on upgrade + * Tue Aug 17 2021 Silvan Calarco 15.0-2mamba - obsolete pulseaudio-esound-compat