Hello community,
here is the log from the commit of package pulseaudio for openSUSE:Factory
checked in at 2013-10-24 14:11:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old)
and /work/SRC/openSUSE:Factory/.pulseaudio.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseaudio"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2013-10-20
10:53:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes
2013-10-24 14:11:47.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Oct 20 20:52:41 UTC 2013 - ohole...@suse.com
+
+- enable bluez4 support for older openSUSE releases
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pulseaudio.spec ++++++
--- /var/tmp/diff_new_pack.9fvpow/_old 2013-10-24 14:11:48.000000000 +0200
+++ /var/tmp/diff_new_pack.9fvpow/_new 2013-10-24 14:11:48.000000000 +0200
@@ -24,6 +24,11 @@
%define soname 0
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
+# store bluez version from bluez-devel and check for bluez4/5
+# _bluezVersion is than also used in requires for bluetooth subpackage
+# once oS 12.3 is EOL, this can be removed as there will probably be nothing
providing bluez4
+%define _bluezVersion %(LC_ALL="C" rpm --qf '%%{VERSION}' -q bluez-devel |
grep -v 'not installed')
+%define _bluez5used 0%(echo "%{_bluezVersion}" | grep -q '^5' && echo 1)
Summary: A Networked Sound Server
License: GPL-2.0+ and LGPL-2.1+
Group: System/Sound Daemons
@@ -40,7 +45,8 @@
Patch1: suppress-socket-error-msg.diff
Patch2: pulseaudio-wrong-memset.patch
BuildRequires: alsa-devel >= 1.0.24
-BuildRequires: bluez-devel >= 5
+# require only minimal bluez, if we are on bluez 5 we will determine in %build
phase
+BuildRequires: bluez-devel >= 4.99
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -182,7 +188,7 @@
Summary: Bluetooth support for the PulseAudio sound server
Group: System/Sound Daemons
Requires: %{name} = %{version}
-Requires: bluez >= 5
+Requires: bluez = %{_bluezVersion}
%description module-bluetooth
pulseaudio is a networked sound server for Linux and other Unix like
@@ -301,7 +307,11 @@
--with-system-group=pulse \
--with-access-group=pulse-access \
--disable-hal-compat \
+%if 0%{?_bluez5used}
--disable-bluez4 \
+%else
+ --disable-bluez5 \
+%endif
--with-udev-rules-dir=%{_udevrulesdir}
make %{?_smp_mflags} V=1
make doxygen
@@ -539,10 +549,16 @@
%files module-bluetooth
%defattr(-,root,root)
%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-policy.so
-%{_libdir}/pulse-%{drvver}/modules/libbluez5-util.so
%{_libdir}/pulse-%{drvver}/modules/module-bluetooth-discover.so
+%if 0%{?_bluez5used}
+%{_libdir}/pulse-%{drvver}/modules/libbluez5-util.so
%{_libdir}/pulse-%{drvver}/modules/module-bluez5-device.so
%{_libdir}/pulse-%{drvver}/modules/module-bluez5-discover.so
+%else
+%{_libdir}/pulse-%{drvver}/modules/libbluez4-util.so
+%{_libdir}/pulse-%{drvver}/modules/module-bluez4-device.so
+%{_libdir}/pulse-%{drvver}/modules/module-bluez4-discover.so
+%endif
%files module-gconf
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
