From 8ec3d4eb1453c4accec95d6e8cff28734fda45c9d141ee0e9f8106afd29defea Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 28 Jan 2023 09:43:37 +0000 Subject: [PATCH] Accepting request 1061238 from home:gmbr3:Active - Move dbus-1 system.d file to /usr (bsc#1207584) OBS-URL: https://build.opensuse.org/request/show/1061238 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=260 --- pulseaudio.changes | 5 +++++ pulseaudio.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pulseaudio.changes b/pulseaudio.changes index 7192a93..d07285a 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 26 15:20:09 UTC 2023 - Callum Farmer + +- Move dbus-1 system.d file to /usr (bsc#1207584) + ------------------------------------------------------------------- Mon Jul 18 12:17:39 UTC 2022 - Takashi Iwai diff --git a/pulseaudio.spec b/pulseaudio.spec index ec54e97..ded4700 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -415,6 +415,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/pulse/system.pa.d install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d/60-disable_flat_volumes.conf # user install -Dm0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/system-user-pulse.conf +# move dbus-1 system.d file to /usr +install -Dm0644 %{buildroot}%{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf %{buildroot}%{_datadir}/dbus-1/system.d/pulseaudio-system.conf +rm -rf %{buildroot}%{_sysconfdir}/dbus-1 + + %find_lang %{name} %pre -n system-user-pulse -f pulseaudio.pre @@ -571,7 +576,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %{_sysconfdir}/pulse/default.pa %config(noreplace) %{_sysconfdir}/pulse/system.pa -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf +%{_datadir}/dbus-1/system.d/pulseaudio-system.conf # init %dir %{_userunitdir} %{_userunitdir}/%{name}.service