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
This commit is contained in:
Tomáš Chvátal
2018-10-22 07:16:34 +00:00
committed by Git OBS Bridge
parent a149b41948
commit 1e1a1e84dd
4 changed files with 44 additions and 9 deletions

View File

@@ -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

View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Oct 19 11:07:58 UTC 2018 - Antonio Larrosa <alarrosa@suse.com>
- 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 <alarrosa@suse.com>
- 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

View File

@@ -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

1
pulseaudio.tmpfiles Normal file
View File

@@ -0,0 +1 @@
d /var/lib/pulseaudio 0755 - - -