diff --git a/pulseaudio-4.0-187-g6f94c.tar.xz b/pulseaudio-4.0-187-g6f94c.tar.xz deleted file mode 100644 index 2c5e53f..0000000 --- a/pulseaudio-4.0-187-g6f94c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c38a314fe2dfffefb32709b697c9599ceaf809a21c6bc3b09a8d05709883e1c -size 1390096 diff --git a/pulseaudio-4.0-265-g35fe.tar.xz b/pulseaudio-4.0-265-g35fe.tar.xz new file mode 100644 index 0000000..6f7b5ec --- /dev/null +++ b/pulseaudio-4.0-265-g35fe.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0781b0ff82c1a9230a3ccea08967bfdfedfdc39a63639e3c0d09586e90759279 +size 1394500 diff --git a/pulseaudio.changes b/pulseaudio.changes index 7a726c4..a7e45ce 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 5 23:37:59 UTC 2013 - dimstar@opensuse.org + +- Update to git mastere (PA 5.0 on the way) (265-g35fe): + + The more extensive bluez5 branch was merged + + PA allows to build bluez4 and bluez5 modules in parallel. + Note: this does not mean that bluez4 and bluez5 can co-exist, + only that PA can decide at runtime which bluez-daemon is + available. +- Pass --disable-bluez4 to configure: we know that we run bluez5. + ------------------------------------------------------------------- Wed Sep 25 17:48:30 UTC 2013 - dimstar@opensuse.org diff --git a/pulseaudio.spec b/pulseaudio.spec index 14d9883..533822b 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -17,9 +17,9 @@ Name: pulseaudio -Version: 4.0+git +Version: 4.0.git.265.g35fe Release: 0 -%define _version 4.0-187-g6f94c +%define _version 4.0-265-g35fe %define drvver 4.0 %define soname 0 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d @@ -281,6 +281,7 @@ NOCONFIGURE=1 ./bootstrap.sh --with-system-group=pulse \ --with-access-group=pulse-access \ --disable-hal-compat \ + --disable-bluez4 \ --with-udev-rules-dir=%{_udevrulesdir} make %{?_smp_mflags} V=1 make doxygen @@ -498,11 +499,10 @@ setup-pulseaudio --auto > /dev/null %files module-bluetooth %defattr(-,root,root) %{_libdir}/pulse-%{drvver}/modules/module-bluetooth-policy.so -%{_libdir}/pulse-%{drvver}/modules/libbluetooth-util.so -%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-device.so +%{_libdir}/pulse-%{drvver}/modules/libbluez5-util.so %{_libdir}/pulse-%{drvver}/modules/module-bluetooth-discover.so -%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-proximity.so -%attr(0755,root,root) %{_libexecdir}/pulse/proximity-helper +%{_libdir}/pulse-%{drvver}/modules/module-bluez5-device.so +%{_libdir}/pulse-%{drvver}/modules/module-bluez5-discover.so %files module-gconf %defattr(-,root,root)