From 158f79b217b657729d12fecf544eb1ac8e04d47c410054875494435ed735f543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 22 Oct 2018 07:16:34 +0000 Subject: [PATCH 1/3] Accepting request 643166 from home:alarrosa:branches:multimedia:libs - Add a Supplements line to pulseaudio-gdm-hooks so it's selected for installation when gdm and pulseaudio are installed. - Don't create files under /var on package installation but using systemd-tmpfiles to be friendly to transactional updates (bsc#1098063, fate#325524) - Add pulseaudio.tmpfiles and pulseaudio-gdm-hooks.tmpfiles OBS-URL: https://build.opensuse.org/request/show/643166 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=195 --- pulseaudio-gdm-hooks.tmpfiles | 2 ++ pulseaudio.changes | 14 ++++++++++++++ pulseaudio.spec | 36 ++++++++++++++++++++++++++--------- pulseaudio.tmpfiles | 1 + 4 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 pulseaudio-gdm-hooks.tmpfiles create mode 100644 pulseaudio.tmpfiles diff --git a/pulseaudio-gdm-hooks.tmpfiles b/pulseaudio-gdm-hooks.tmpfiles new file mode 100644 index 0000000..3a9be6b --- /dev/null +++ b/pulseaudio-gdm-hooks.tmpfiles @@ -0,0 +1,2 @@ +d /var/lib/gdm/.pulse 0755 - - - +C /var/lib/gdm/.pulse/default.pa 0644 - - - /usr/share/factory/var/lib/gdm/.pulse/default.pa diff --git a/pulseaudio.changes b/pulseaudio.changes index a9c927f..fe7d9c0 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Oct 19 11:07:58 UTC 2018 - Antonio Larrosa + +- Add a Supplements line to pulseaudio-gdm-hooks so it's selected + for installation when gdm and pulseaudio are installed. + +------------------------------------------------------------------- +Thu Oct 18 15:25:34 UTC 2018 - Antonio Larrosa + +- Don't create files under /var on package installation but using + systemd-tmpfiles to be friendly to transactional updates + (bsc#1098063, fate#325524) +- Add pulseaudio.tmpfiles and pulseaudio-gdm-hooks.tmpfiles + ------------------------------------------------------------------- Mon Jul 16 12:49:15 UTC 2018 - oholecek@suse.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 5959d84..c7e0b93 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -40,6 +40,8 @@ Source3: sysconfig.sound-pulseaudio Source4: pulseaudio-server.fw Source5: pulseaudio.service Source6: disable_flat_volumes.conf +Source7: pulseaudio.tmpfiles +Source8: pulseaudio-gdm-hooks.tmpfiles Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff @@ -131,7 +133,7 @@ of ESOUND. Summary: LIRC module for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} -Supplements: packageand(pulseaudio:lirc-core) +Supplements: packageand(pulseaudio:lirc-core) %description module-lirc pulseaudio is a networked sound server for Linux and other Unix like @@ -158,7 +160,7 @@ the PulseAudio sound server on X11 startup. Summary: Zeroconf module for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} -Supplements: packageand(pulseaudio:avahi) +Supplements: packageand(pulseaudio:avahi) %description module-zeroconf pulseaudio is a networked sound server for Linux and other Unix like @@ -203,7 +205,7 @@ Summary: Bluetooth support for the PulseAudio sound server Group: System/Sound Daemons Requires: %{name} = %{version} Requires: bluez >= 5 -Supplements: packageand(pulseaudio:bluez) +Supplements: packageand(pulseaudio:bluez) %description module-bluetooth pulseaudio is a networked sound server for Linux and other Unix like @@ -306,6 +308,7 @@ Group: Productivity/Multimedia/Other #!BuildIgnore: gdm Requires: %{name} = %{version} Requires: gdm >= 2.22 +Supplements: packageand(pulseaudio:gdm) #for the gdm user Requires(pre): gdm @@ -397,8 +400,11 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir} mkdir -p %{buildroot}%{_sysconfdir}/profile.d touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.sh touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.csh -mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.pulse -cp $RPM_SOURCE_DIR/default.pa-for-gdm %{buildroot}%{_localstatedir}/lib/gdm/.pulse/default.pa +mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d +install -m 644 %{SOURCE7} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio.conf +install -m 644 %{SOURCE8} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio-gdm-hooks.conf +mkdir -p %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse +install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa ln -s esdcompat %{buildroot}%{_bindir}/esd # install firewall rule on SUSE %if %{defined suse_version} @@ -427,6 +433,7 @@ exit 0 %postun -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig %post /sbin/ldconfig +%tmpfiles_create pulseaudio.conf %{fillup_only -an sound} # Update the /etc/profile.d/pulseaudio.* files setup-pulseaudio --auto > /dev/null @@ -448,8 +455,12 @@ exit 0 %service_del_postun pulseaudio.service exit 0 +%post gdm-hooks +%tmpfiles_create pulseaudio-gdm-hooks.conf + %files -%doc README LICENSE GPL LGPL +%doc README +%license LICENSE GPL LGPL %{_bindir}/pulseaudio %{_bindir}/setup-pulseaudio %{_bindir}/qpaeq @@ -560,6 +571,7 @@ exit 0 %dir %{_libexecdir}/systemd/user %{_libexecdir}/systemd/user/%{name}.service %{_libexecdir}/systemd/user/%{name}.socket +%{_prefix}/lib/tmpfiles.d/pulseaudio.conf %if %{defined suse_version} %config(noreplace) %{_fwdefdir}/pulseaudio-server @@ -575,9 +587,15 @@ exit 0 %{_mandir}/man1/esdcompat.1* %files gdm-hooks -%attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm -%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse -%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa +%attr(0750, gdm, gdm) %ghost %dir %{_localstatedir}/lib/gdm +%attr(0700, gdm, gdm) %ghost %dir %{_localstatedir}/lib/gdm/.pulse +%attr(0600, gdm, gdm) %ghost %{_localstatedir}/lib/gdm/.pulse/default.pa +%dir %{_prefix}/share/factory/var +%dir %{_prefix}/share/factory/var/lib +%dir %{_prefix}/share/factory/var/lib/gdm +%dir %{_prefix}/share/factory/var/lib/gdm/.pulse +%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa +%{_prefix}/lib/tmpfiles.d/pulseaudio-gdm-hooks.conf %files -n libpulse%{soname} %doc README LICENSE GPL LGPL diff --git a/pulseaudio.tmpfiles b/pulseaudio.tmpfiles new file mode 100644 index 0000000..70aa2cc --- /dev/null +++ b/pulseaudio.tmpfiles @@ -0,0 +1 @@ +d /var/lib/pulseaudio 0755 - - - From 6f1cb5c8a86826d50c756210c8011df4a276d12a7d311df3cc75c89347eff7fd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 15 Nov 2018 14:56:32 +0000 Subject: [PATCH 2/3] Accepting request 649306 from home:tiwai:branches:multimedia:libs - Fix setup-pulseaudio script to deal with the new alsa/conf.d setup that was introduced since alsa-lib 1.1.7 (bsc#1116153) OBS-URL: https://build.opensuse.org/request/show/649306 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=196 --- pulseaudio.changes | 6 ++++++ setup-pulseaudio | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pulseaudio.changes b/pulseaudio.changes index fe7d9c0..2455594 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 15 12:48:41 CET 2018 - tiwai@suse.de + +- Fix setup-pulseaudio script to deal with the new alsa/conf.d + setup that was introduced since alsa-lib 1.1.7 (bsc#1116153) + ------------------------------------------------------------------- Fri Oct 19 11:07:58 UTC 2018 - Antonio Larrosa diff --git a/setup-pulseaudio b/setup-pulseaudio index 2ac994b..5af85e4 100644 --- a/setup-pulseaudio +++ b/setup-pulseaudio @@ -78,10 +78,19 @@ enable_kmix() { enable_alsa() { echo "Enabling PulseAudio for ALSA..." - if [ -f /etc/alsa-pulse.conf ]; then + if [ -f /etc/alsa/conf.d/99-pulseaudio-default.conf ]; then + return 0 + fi + if [ -f /etc/alsa/conf.d/99-pulseaudio-default.conf.example ]; then + ln -s 99-pulseaudio-default.conf.example /etc/alsa/conf.d/99-pulseaudio-default.conf + delete_variable ALSA_CONFIG_PATH + elif [ -f /usr/share/alsa/conf.d/99-pulseaudio-default.conf.example ]; then + ln -s /usr/share/alsa/conf.d/99-pulseaudio-default.conf.example /etc/alsa/conf.d/99-pulseaudio-default.conf + delete_variable ALSA_CONFIG_PATH + elif [ -f /etc/alsa-pulse.conf ]; then set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf else - echo "Missing /etc/alsa-pluse.conf; please install alsa-plugins-pulse package" + echo "Please install alsa-plugins-pulse package" delete_variable ALSA_CONFIG_PATH fi } @@ -210,6 +219,7 @@ enable_autospawn() { disable_alsa() { echo "Disabling PulseAudio for ALSA..." delete_variable ALSA_CONFIG_PATH + rm -f /etc/alsa/conf.d/99-pulseaudio-default.conf } disable_phonon() { From b1c18aae0dbac995341d544ccf0b4813a289b08954dd72fe9d7ba4c3168645ab Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 19 Nov 2018 08:33:30 +0000 Subject: [PATCH 3/3] Accepting request 650114 from home:tiwai:branches:multimedia:libs - Drop ghost from gdm hook dir to sync with gdm package itself OBS-URL: https://build.opensuse.org/request/show/650114 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=197 --- pulseaudio.changes | 5 +++++ pulseaudio.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pulseaudio.changes b/pulseaudio.changes index 2455594..1f5463d 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 18 11:34:25 CET 2018 - tiwai@suse.de + +- Drop ghost from gdm hook dir to sync with gdm package itself + ------------------------------------------------------------------- Thu Nov 15 12:48:41 CET 2018 - tiwai@suse.de diff --git a/pulseaudio.spec b/pulseaudio.spec index c7e0b93..7a4ff90 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -405,6 +405,7 @@ install -m 644 %{SOURCE7} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio.conf install -m 644 %{SOURCE8} %{buildroot}%{_prefix}/lib/tmpfiles.d/pulseaudio-gdm-hooks.conf mkdir -p %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa +mkdir -p %{buildroot}%{_localstatedir}/lib/gdm ln -s esdcompat %{buildroot}%{_bindir}/esd # install firewall rule on SUSE %if %{defined suse_version} @@ -587,7 +588,7 @@ exit 0 %{_mandir}/man1/esdcompat.1* %files gdm-hooks -%attr(0750, gdm, gdm) %ghost %dir %{_localstatedir}/lib/gdm +%attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm %attr(0700, gdm, gdm) %ghost %dir %{_localstatedir}/lib/gdm/.pulse %attr(0600, gdm, gdm) %ghost %{_localstatedir}/lib/gdm/.pulse/default.pa %dir %{_prefix}/share/factory/var