From a6102115862dff6b94ca7cc1c05609f3f51d3c32 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 18 Feb 2015 22:02:38 +0100 Subject: [PATCH] - up to 6.0 - start-pulseaudio-kde merged into start-pulseaudio-x11 --- pulseaudio.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pulseaudio.spec b/pulseaudio.spec index cceccc4..b1423ab 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -16,12 +16,12 @@ Summary: Modular sound server Summary(pl.UTF-8): Modularny serwer dźwięku Name: pulseaudio -Version: 5.0 -Release: 2 +Version: 6.0 +Release: 1 License: GPL v2+ (server and libpulsecore), LGPL v2+ (libpulse) Group: Libraries Source0: http://freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz -# Source0-md5: c43749838612f4860465e83ed62ca38e +# Source0-md5: b691e83b7434c678dffacfa3a027750e Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.tmpfiles @@ -42,7 +42,7 @@ BuildRequires: glib2-devel >= 1:2.4.0 BuildRequires: gtk+3-devel >= 3.0 BuildRequires: intltool >= 0.35.0 BuildRequires: jack-audio-connection-kit-devel >= 0.117.0 -BuildRequires: json-c-devel >= 0.9 +BuildRequires: json-c-devel >= 0.11 BuildRequires: libasyncns-devel >= 0.1 BuildRequires: libcap-devel BuildRequires: libltdl-devel >= 2:2.4 @@ -426,7 +426,7 @@ install -Dp %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf -install -m644 shell-completion/pulseaudio-zsh-completion.zsh $RPM_BUILD_ROOT%{zshdir}/_pulseaudio +install -m644 shell-completion/zsh/_pulseaudio $RPM_BUILD_ROOT%{zshdir}/_pulseaudio %find_lang %{name} @@ -486,7 +486,6 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/daemon.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pulse/default.pa %{_sysconfdir}/xdg/autostart/pulseaudio.desktop -%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop %attr(755,root,root) %{_bindir}/pacat %attr(755,root,root) %{_bindir}/pacmd %attr(755,root,root) %{_bindir}/pactl @@ -498,7 +497,6 @@ fi %attr(755,root,root) %{_bindir}/pasuspender %attr(755,root,root) %{_bindir}/pax11publish %attr(755,root,root) %{_bindir}/pulseaudio -%attr(755,root,root) %{_bindir}/start-pulseaudio-kde %attr(755,root,root) %{_bindir}/start-pulseaudio-x11 %dir %{_libdir}/pulse %dir %{_libdir}/pulse-* @@ -587,6 +585,8 @@ fi %attr(755,root,root) %{_libdir}/pulse-*/modules/module-x11-xsmp.so %attr(755,root,root) %{_libdir}/pulse-*/modules/module-zeroconf-discover.so %attr(755,root,root) %{_libdir}/pulse-*/modules/module-zeroconf-publish.so +%{systemduserunitdir}/pulseaudio.service +%{systemduserunitdir}/pulseaudio.socket %{_mandir}/man1/pacat.1* %{_mandir}/man1/pacmd.1* %{_mandir}/man1/pactl.1* @@ -595,7 +595,6 @@ fi %{_mandir}/man1/pasuspender.1* %{_mandir}/man1/pax11publish.1* %{_mandir}/man1/pulseaudio.1* -%{_mandir}/man1/start-pulseaudio-kde.1* %{_mandir}/man1/start-pulseaudio-x11.1* %{_mandir}/man5/default.pa.5* %{_mandir}/man5/pulse-cli-syntax.5* @@ -659,6 +658,8 @@ fi %{_datadir}/vala/vapi/libpulse.vapi %{_datadir}/vala/vapi/libpulse-mainloop-glib.deps %{_datadir}/vala/vapi/libpulse-mainloop-glib.vapi +%{_datadir}/vala/vapi/libpulse-simple.deps +%{_datadir}/vala/vapi/libpulse-simple.vapi %files esound-compat %defattr(644,root,root,755) @@ -723,7 +724,7 @@ fi %files -n bash-completion-pulseaudio %defattr(644,root,root,755) -/etc/bash_completion.d/pulseaudio-bash-completion.sh +/etc/bash_completion.d/* %files -n zsh-completion-pulseaudio %defattr(644,root,root,755) -- 2.44.0