Accepting request 262679 from home:oholecek:branches:multimedia:libs

- Update to 6.0 RC1 (5.99.1)
  + Remove patch pulseaudio-bnc881524-rtp.patch
  + Update patch disabled-start.diff
  + Bash&zsh completion split to separate subpackage
  + json-c >= 0.11 is now required
    (note: break build on oS 13.1)
- Fix %postun for system-wide mode

Note this contain patches removed by Takashi, so it may reintroduce
boo#905418 at al.

Also consider if it is worth forwarding to factory now as (AFAIK) there are no pulseaudio tests in openQA so far and I'll start some tests only later today.

OBS-URL: https://build.opensuse.org/request/show/262679
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=148

pulseaudio.spec

@@ -17,9 +17,9 @@
 
 
 Name:           pulseaudio
-Version:        5.0
+Version:        5.99.1
 Release:        0
-%define drvver  5.0
+%define drvver  5.99
 %define soname  0
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
@@ -42,8 +42,6 @@ Source99:       baselibs.conf
 Patch0:         disabled-start.diff
 Patch1:         suppress-socket-error-msg.diff
 Patch2:         pulseaudio-wrong-memset.patch
-# PATCH-FIX-UPSTREAM pulseaudio-bnc881524-rtp.patch sreeves@suse.com
-Patch3:         pulseaudio-bnc881524-rtp.patch
 BuildRequires:  alsa-devel >= 1.0.19
 # require only minimal bluez, if we are on bluez 5 we will determine in %build phase
 BuildRequires:  bluez-devel >= 4.99
@@ -76,7 +74,7 @@ BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(ice)
-BuildRequires:  pkgconfig(json) >= 0.9
+BuildRequires:  pkgconfig(json) >= 0.11
 BuildRequires:  pkgconfig(sbc) >= 1.0
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(x11)
@@ -90,6 +88,7 @@ Requires:       udev >= 146
 ## needs the same liborc version which was used to build against
 %requires_eq liborc-0_4-0
 Recommends:     %{name}-lang
+Recommends:     %{name}-bash-completion
 Recommends:     alsa-plugins-pulse
 Obsoletes:      libpulsecore9 < 0.9.15
 Provides:       libpulsecore9 = 0.9.15
@@ -291,13 +290,30 @@ 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
+Requires:       %{name} = %{version}
+Requires:       bash
+
+%description bash-completion
+Optional dependency offering bash completion for various PulseAudio utilities
+
+%package zsh-completion
+Summary:        PulseAudio zsh completion
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Requires:       zsh
+
+%description zsh-completion
+Optional dependency offering zsh completion for various PulseAudio utilities
+
 %lang_package
 %prep
 %setup -q -T -b0
 %patch0
 %patch1 -p1
 %patch2
-%patch3 -p1
 
 %build
 echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in
@@ -337,7 +353,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
 # openSUSE 11.3 cannot find the .desktop files
 %suse_update_desktop_file pulseaudio
-%suse_update_desktop_file pulseaudio-kde
 %find_lang %{name}
 install %{SOURCE2} %{buildroot}%{_bindir}
 chmod 755 %{buildroot}%{_bindir}/setup-pulseaudio
@@ -395,7 +410,7 @@ exit 0
 exit 0
 
 %postun system-wide
-%service_del_preun pulseaudio.service
+%service_del_postun pulseaudio.service
 exit 0
 
 %files
@@ -503,7 +518,13 @@ exit 0
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
 %config(noreplace) %{_sysconfdir}/pulse/system.pa
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf
-%config(noreplace) %{_sysconfdir}/bash_completion.d/pulseaudio-bash-completion.sh
+# init
+%dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/user
+%{_libexecdir}/systemd/user/%{name}.service
+%{_libexecdir}/systemd/user/%{name}.socket
+
+
 %if %{defined suse_version}
 %config(noreplace) %{_fwdefdir}/pulseaudio-server
 %endif
@@ -585,14 +606,11 @@ exit 0
 %files module-x11
 %defattr(-,root,root)
 %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
-%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 %{_bindir}/start-pulseaudio-x11
-%{_bindir}/start-pulseaudio-kde
 %{_libdir}/pulse-%{drvver}/modules/module-x11-bell.so
 %{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so
 %{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so
 %{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so
-%doc %{_mandir}/man1/start-pulseaudio-kde.1*
 %doc %{_mandir}/man1/start-pulseaudio-x11.1*
 
 %files module-zeroconf
@@ -627,9 +645,28 @@ exit 0
 %files lang -f %{name}.lang
 
 %files system-wide
+%defattr(-,root,root)
 %{_sbindir}/rc%{name}
-%dir /usr/lib/systemd
-%dir /usr/lib/systemd/system
-/usr/lib/systemd/system/%{name}.service
+%dir %{_libexecdir}/systemd/system
+%{_libexecdir}/systemd/system/%{name}.service
+
+%files bash-completion
+%defattr(-,root,root)
+%dir %{_sysconfdir}/bash_completion.d
+%config %{_sysconfdir}/bash_completion.d/pulseaudio
+%config %{_sysconfdir}/bash_completion.d/pacat
+%config %{_sysconfdir}/bash_completion.d/pacmd
+%config %{_sysconfdir}/bash_completion.d/pactl
+%config %{_sysconfdir}/bash_completion.d/padsp
+%config %{_sysconfdir}/bash_completion.d/paplay
+%config %{_sysconfdir}/bash_completion.d/parec
+%config %{_sysconfdir}/bash_completion.d/parecord
+%config %{_sysconfdir}/bash_completion.d/pasuspender
+
+%files zsh-completion
+%defattr(-,root,root)
+%dir %{_datarootdir}/zsh
+%dir %{_datarootdir}/zsh/site-functions/
+%config %{_datarootdir}/zsh/site-functions/_pulseaudio
 
 %changelog