Accepting request 1096122 from home:favogt:lessgdm

- Drop pulseaudio-gdm-hooks subpackage including default.pa-for-gdm
  and pulseaudio-gdm-hooks.tmpfiles. Moved to gdm instead.

OBS-URL: https://build.opensuse.org/request/show/1096122
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=262
This commit is contained in:
Takashi Iwai 2023-06-30 13:46:09 +00:00 committed by Git OBS Bridge
parent 87f4d1ac38
commit 87eb029056
4 changed files with 6 additions and 64 deletions

View File

@ -1,25 +0,0 @@
load-module module-device-restore
load-module module-card-restore
load-module module-udev-detect
load-module module-native-protocol-unix
load-module module-default-device-restore
load-module module-always-sink
load-module module-intended-roles
load-module module-suspend-on-idle
load-module module-console-kit
load-module module-position-event-sounds
### unload driver modules for Bluetooth hardware
### this ensure Bluetooth headset are not stolen by gdm pulseaudio instance
.nofail
.ifexists module-bluetooth-policy.so
unload-module module-bluetooth-policy
.endif
.ifexists module-bluetooth-discover.so
unload-module module-bluetooth-discover
.endif
.fail

View File

@ -1,2 +0,0 @@
d /var/lib/gdm/.pulse 0700 gdm gdm -
C /var/lib/gdm/.pulse/default.pa 0600 gdm gdm - /usr/share/factory/var/lib/gdm/.pulse/default.pa

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 30 11:01:11 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Drop pulseaudio-gdm-hooks subpackage including default.pa-for-gdm
and pulseaudio-gdm-hooks.tmpfiles. Moved to gdm instead.
-------------------------------------------------------------------
Thu Mar 23 14:59:04 UTC 2023 - Martin Liška <mliska@suse.cz>

View File

@ -37,13 +37,11 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Sound Daemons
Url: https://www.freedesktop.org/wiki/Software/PulseAudio/
Source: https://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
Source1: default.pa-for-gdm
Source2: setup-pulseaudio
Source3: sysconfig.sound-pulseaudio
Source5: pulseaudio.service
Source6: disable_flat_volumes.conf
Source7: pulseaudio.tmpfiles
Source8: pulseaudio-gdm-hooks.tmpfiles
Source9: client-system.conf
Source10: system-user-pulse.conf
Source98: pulseaudio-rpmlintrc
@ -290,24 +288,6 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
This package provides utilies for making use of the PulseAudio sound
server.
%package gdm-hooks
Summary: PulseAudio GDM integration
Group: Productivity/Multimedia/Other
#avoid cycle
#!BuildIgnore: gdm
Requires: %{name} = %{version}
Requires: gdm >= 2.22
Supplements: (pulseaudio and gdm)
#for the gdm user
Requires(pre): gdm
%description gdm-hooks
pulseaudio is a networked sound server for Linux and other Unix like
operating systems and Microsoft Windows. It is intended to be an
improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
This package contains GDM integration hooks for the PulseAudio sound server.
%package bash-completion
Summary: PulseAudio Bash completion
Group: System/Shells
@ -401,9 +381,6 @@ touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.sh
touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.csh
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
# create .d conf dirs (since 8.0)
mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d
install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pulse/client.conf.d/50-system.conf
@ -474,9 +451,6 @@ exit 0
%post setup
%{fillup_only -an sound}
%post gdm-hooks
%tmpfiles_create pulseaudio-gdm-hooks.conf
%files
%doc README
%license LICENSE GPL LGPL
@ -595,17 +569,6 @@ exit 0
%ghost %{_sysconfdir}/profile.d/pulseaudio.sh
%ghost %{_sysconfdir}/profile.d/pulseaudio.csh
%files gdm-hooks
%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}
%license LICENSE GPL LGPL
%dir %{_sysconfdir}/pulse/