diff --git a/pulseaudio.spec b/pulseaudio.spec index b3bc021..333f9c1 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -2,8 +2,8 @@ #global pa_minor 0 %global snap 20141103 -%global gitrel 323 -%global gitcommit 6d1fd4d1aab38a18925972f11face92ea602adf0 +%global gitrel 327 +%global gitcommit aec811798cd883a454b9b5cd82c77831906bbd2d %global shortcommit %(c=%{gitcommit}; echo ${c:0:5}) #323-g6d1fd @@ -38,6 +38,8 @@ Source1: default.pa-for-gdm ## upstreamable patches BuildRequires: automake libtool +BuildRequires: pkgconfig(bash-completion) +%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d') BuildRequires: m4 BuildRequires: libtool-ltdl-devel BuildRequires: intltool @@ -286,6 +288,13 @@ mv -fv $RPM_BUILD_ROOT/lib/udev/rules.d/90-pulseaudio.rules $RPM_BUILD_ROOT%{_pr mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/pulse install -p -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_localstatedir}/lib/gdm/.pulse/default.pa +# bash completions +%if "%{bash_completionsdir}" != "/etc/bash_completion.d" +mkdir -p $RPM_BUILD_ROOT%{bash_completionsdir} +mv $RPM_BUILD_ROOT/etc/bash_completion.d/* \ + $RPM_BUILD_ROOT%{bash_completionsdir}/ +%endif + ## unpackaged files # extraneous libtool crud rm -fv $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/*.la @@ -335,8 +344,9 @@ exit 0 %config(noreplace) %{_sysconfdir}/pulse/default.pa %config(noreplace) %{_sysconfdir}/pulse/system.pa %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf -%dir %{_sysconfdir}/bash_completion.d/ -%{_sysconfdir}/bash_completion.d/pulseaudio-bash-completion.sh +%{bash_completionsdir}/* +%{_prefix}/lib/systemd/user/pulseaudio.service +%{_prefix}/lib/systemd/user/pulseaudio.socket %{_bindir}/pulseaudio %{_libdir}/libpulsecore-%{pa_major}.so %dir %{_libdir}/pulse-%{pa_major}/ @@ -551,8 +561,9 @@ exit 0 %changelog -* Wed Nov 05 2014 Rex Dieter 5.0-23.20141103git6d1fd -- 20141103 snapshot +* Thu Nov 06 2014 Rex Dieter - 5.0-23.20141103gitaec81 +- 20141103 327-gaec81 snapshot, pulseaudio socket activation support +- use bash completionsdir * Wed Nov 05 2014 Orion Poplawski 5.0-22.20141007git4971d - Really add pulse-rt group when needed (bug #885020) diff --git a/sources b/sources index bda7978..4188349 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac426cc16e66e2e159797d5298196c3e pulseaudio-5.0-323-g6d1fd.tar.xz +1733e9e673e1d2008b0330df449c2792 pulseaudio-5.0-327-gaec81.tar.xz