- updated to 4.0

- updated pa-machine-id patch

diff --git a/pulseaudio-pa-machine-id.patch b/pulseaudio-pa-machine-id.patch
index 87c85e62a74a357b27c1b12d2a7890ac68c68221..9ea066a122e7358bacc59d317315b27acf9ec565 100644 (file)
--- a/pulseaudio-pa-machine-id.patch
+++ b/pulseaudio-pa-machine-id.patch
@@ -1,15 +1,14 @@
---- pulseaudio-1.0/configure.ac.orig   2011-09-27 09:55:58.000000000 +0200
-+++ pulseaudio-1.0/configure.ac        2011-10-12 20:57:56.702352030 +0200
-@@ -1112,6 +1112,9 @@
- AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
- AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
+--- pulseaudio-4.0/configure.ac.orig   2013-06-08 13:07:47.119786074 +0200
++++ pulseaudio-4.0/configure.ac        2013-06-08 13:09:53.796450100 +0200
+@@ -991,6 +991,8 @@
  
+ PA_MACHINE_ID="${sysconfdir}/machine-id"
+ AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
 +PA_PA_MACHINE_ID="${sysconfdir}/pulse/machine-id"
 +AX_DEFINE_DIR(PA_PA_MACHINE_ID, PA_PA_MACHINE_ID, [PA machine-id file])
-+
- AC_DEFINE_UNQUOTED(PA_BUILDDIR, "${ac_pwd}/src", [Location of uninstalled binaries])
- 
- #### Mac OSX specific stuff #####
+ PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
+ AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
+             [Fallback machine-id file])
 --- pulseaudio-3.0/src/pulsecore/core-util.c.orig      2012-12-22 08:18:53.590608852 +0100
 +++ pulseaudio-3.0/src/pulsecore/core-util.c   2012-12-22 09:05:12.940550922 +0100
 @@ -2893,6 +2893,20 @@

diff --git a/pulseaudio.spec b/pulseaudio.spec
index 568901661e9cdf2794ead3cba975d74d29e12706..3144b2df51fd55119d182480baf38f492967445d 100644 (file)
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -5,7 +5,6 @@
 %bcond_with    gdbm            # use gdbm as backend for settings database
                                # see https://tango.0pointer.de/pipermail/pulseaudio-discuss/2009-May/003761.html
                                # thread, why it's a bad idea
-%bcond_with    hal             # if you really must; HAL is obsolete, use UDEV
 %bcond_without lirc            # without lirc module
 %bcond_without xen             # Xen paravirtualized driver
 %bcond_with    static_libs     # build static libraries
@@ -13,12 +12,12 @@
 Summary:       Modular sound server
 Summary(pl.UTF-8):     Modularny serwer dźwięku
 Name:          pulseaudio
-Version:       3.0
+Version:       4.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: 47fd7eca8479c757822bee68a1feef25
+# Source0-md5: 591f211db2790a7e4d222f2dc6858db3
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
@@ -27,19 +26,18 @@ Patch1:             %{name}-pa-machine-id.patch
 Patch2:                mate-desktop.patch
 URL:           http://pulseaudio.org/
 BuildRequires: GConf2-devel >= 2.4.0
-BuildRequires: alsa-lib-devel >= 1.0.19
+BuildRequires: alsa-lib-devel >= 1.0.24
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: avahi-devel >= 0.6.0
 BuildRequires: bluez-libs-devel >= 4.99
-BuildRequires: dbus-devel >= 1.3.0
+BuildRequires: dbus-devel >= 1.4.12
 BuildRequires: fftw3-single-devel >= 3
 BuildRequires: gcc >= 6:4.1
 %{?with_gdbm:BuildRequires:    gdbm-devel}
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.4.0
-BuildRequires: gtk+2-devel >= 2:2.4.0
-%{?with_hal:BuildRequires:     hal-devel >= 0.5.11}
+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
@@ -53,7 +51,6 @@ BuildRequires:        libwrap-devel
 BuildRequires: libxcb-devel >= 1.6
 %{?with_lirc:BuildRequires:    lirc-devel}
 BuildRequires: m4
-BuildRequires: webrtc-audio-processing-devel
 # for module-roap
 BuildRequires: openssl-devel > 0.9
 BuildRequires: orc-devel >= 0.4.11
@@ -65,6 +62,7 @@ BuildRequires:        speex-devel >= 1:1.2-beta3
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel >= 1:143
+BuildRequires: webrtc-audio-processing-devel
 %{?with_xen:BuildRequires:     xen-devel}
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
@@ -73,7 +71,7 @@ BuildRequires:        xorg-lib-libXtst-devel
 BuildRequires: xz
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      avahi >= 0.6.0
-Requires:      dbus >= 1.3.0
+Requires:      dbus >= 1.4.12
 Obsoletes:     polypaudio
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -144,7 +142,7 @@ equalizer).
 Summary:       PulseAudio libraries
 Summary(pl.UTF-8):     Biblioteki PulseAudio
 Group:         Libraries
-Requires:      dbus-libs >= 1.3.0
+Requires:      dbus-libs >= 1.4.12
 Requires:      glib2 >= 1:2.4.0
 Requires:      json-c >= 0.9
 Requires:      libasyncns >= 0.1
@@ -232,7 +230,7 @@ Summary(pl.UTF-8):  Moduły ALSA dla PulseAudio
 License:       GPL v2+
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      alsa-lib >= 1.0.19
+Requires:      alsa-lib >= 1.0.24
 Obsoletes:     polypaudio-alsa
 
 %description alsa
@@ -292,7 +290,6 @@ Summary(pl.UTF-8):  Moduł HAL dla PulseAudio
 License:       GPL v2+
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-%{?with_hal:Requires:  hal >= 0.5.11}
 
 %description hal
 HAL module for PulseAudio to detect available audio hardware and load
@@ -344,6 +341,19 @@ Xen paravirtualized driver for PulseAudio.
 %description xen -l pl.UTF-8
 Sterownik parawirtualny Xen dla PulseAudio.
 
+%package -n bash-completion-pulseaudio
+Summary:       Bash completion for PulseAudio commands
+Summary(pl.UTF-8):     Bashowe uzupełnianie parametrów dla poleceń PulseAudio
+Group:         Applications/Shells
+Requires:      %{name} = %{version}-%{release}
+Requires:      bash-completion
+
+%description -n bash-completion-pulseaudio
+Bash completion for PulseAudio commands.
+
+%description -n bash-completion-pulseaudio -l pl.UTF-8
+Bashowe uzupełnianie parametrów dla poleceń PulseAudio.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -359,8 +369,7 @@ Sterownik parawirtualny Xen dla PulseAudio.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{?with_hal:--enable-hal --disable-hal-compat} \
-       %{!?with_hal:--disable-hal --enable-hal-compat} \
+       --enable-hal-compat \
        %{!?with_lirc:--disable-lirc} \
        --disable-silent-rules \
        %{!?with_xen:--disable-xen} \
@@ -523,8 +532,10 @@ fi
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-raop-discover.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-raop-sink.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-remap-sink.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-remap-source.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-rescue-streams.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-role-cork.so
+%attr(755,root,root) %{_libdir}/pulse-*/modules/module-role-ducking.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-rtp-recv.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-rtp-send.so
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-rygel-media-server.so
@@ -680,3 +691,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/pulse-*/modules/module-xenpv-sink.so
 %endif
+
+%files -n bash-completion-pulseaudio
+%defattr(644,root,root,755)
+/etc/bash_completion.d/pulseaudio-bash-completion.sh