Accepting request 1096888 from home:favogt:lessgdm
- Merge pulseaudio-gdm-hooks into the gdm package. This was previously part of pulseaudio.spec, which was fairly complex (dir ownership, separate tmpfiles, dependencies) and it also caused pulseaudio.spec to runtime depend on gdm. Avoid all of that by just adding it here: + Add default.pa + Add entries to gdm.tmpfiles OBS-URL: https://build.opensuse.org/request/show/1096888 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=522
This commit is contained in:
parent
e7e83c16e1
commit
01c8ef6303
25
default.pa
Normal file
25
default.pa
Normal file
@ -0,0 +1,25 @@
|
||||
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
|
||||
|
10
gdm.changes
10
gdm.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 30 11:28:29 UTC 2023 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Merge pulseaudio-gdm-hooks into the gdm package. This was previously
|
||||
part of pulseaudio.spec, which was fairly complex (dir ownership,
|
||||
separate tmpfiles, dependencies) and it also caused pulseaudio.spec
|
||||
to runtime depend on gdm. Avoid all of that by just adding it here:
|
||||
+ Add default.pa
|
||||
+ Add entries to gdm.tmpfiles
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 5 18:22:08 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
11
gdm.spec
11
gdm.spec
@ -55,6 +55,8 @@ Source12: gdm-sle.pamd
|
||||
Source13: gdm-autologin-sle.pamd
|
||||
Source14: gdm-fingerprint-sle.pamd
|
||||
Source15: gdm-smartcard-sle.pamd
|
||||
# Configuration for pulseaudio
|
||||
Source20: default.pa
|
||||
# WARNING: do not remove/significantly change patch0 without updating the relevant patch in accountsservice too
|
||||
# PATCH-FIX-OPENSUSE gdm-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
|
||||
Patch0: gdm-s390-not-require-g-s-d_wacom.patch
|
||||
@ -140,6 +142,8 @@ Provides: gdm2 = %{version}
|
||||
Obsoletes: gdm2 < %{version}
|
||||
Provides: gnome-applets-gdm = %{version}
|
||||
Obsoletes: gnome-applets-gdm < %{version}
|
||||
Provides: pulseaudio-gdm-hooks = 16.1
|
||||
Obsoletes: pulseaudio-gdm-hooks <= 16.1
|
||||
DocDir: %{_defaultdocdir}
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: pkgconfig(xorg-server)
|
||||
@ -331,6 +335,8 @@ install -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/systemd/logind.conf.d/rese
|
||||
mkdir -p %{buildroot}%{_sysusersdir}
|
||||
install -m 644 %{SOURCE11} %{buildroot}%{_sysusersdir}/gdm.conf
|
||||
|
||||
install -D -m 644 %{SOURCE20} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.pulse/default.pa
|
||||
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%fdupes -s %{buildroot}%{_datadir}/help
|
||||
|
||||
@ -369,6 +375,9 @@ dconf update
|
||||
%dir %{_datadir}/dconf
|
||||
%dir %{_datadir}/dconf/profile
|
||||
%{_datadir}/dconf/profile/gdm
|
||||
%dir %{_datadir}/factory/var
|
||||
%dir %{_datadir}/factory/var/lib
|
||||
%{_datadir}/factory/var/lib/gdm
|
||||
%{_datadir}/gdm/
|
||||
%{_datadir}/gnome-session/sessions/gnome-login.session
|
||||
%{_pam_moduledir}/pam_gdm.so
|
||||
@ -376,6 +385,8 @@ dconf update
|
||||
%{_libexecdir}/gdm/gdm-*
|
||||
%{_libexecdir}/gdm/gdmflexiserver
|
||||
%ghost %attr(750,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
|
||||
%ghost %attr(711,root,gdm) %dir %{_localstatedir}/log/gdm
|
||||
%ghost %dir %{_localstatedir}/cache/gdm
|
||||
%ghost %attr(711,root,gdm) %dir /run/gdm
|
||||
|
@ -1,4 +1,6 @@
|
||||
d /var/lib/gdm 0750 gdm gdm -
|
||||
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
|
||||
d /var/log/gdm 0711 root gdm -
|
||||
d /var/cache/gdm 1755 root root -
|
||||
d /run/gdm 0711 root gdm -
|
||||
|
Loading…
x
Reference in New Issue
Block a user