Accepting request 197819 from home:dimstar:bluez5

- update to bluez-5.8
  * changelog is in the package

- update to bluez-5.4
  Huge, incompatible update. Some points:
  * hcidump merged
  * obexd merged
  * no unix socket anymore (only d-bus)
  * libbluetooth and bluez-devel is *deprecated* and will be
    removed. Only included for now to keep the breakage smaller.

OBS-URL: https://build.opensuse.org/request/show/197819
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=143

0001-network-fix-network-Connect-method-parameters.patch

@@ -1,27 +0,0 @@
-From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
-From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-Date: Sat, 30 Jun 2012 00:39:05 -0300
-Subject: [PATCH] network: fix network Connect() method parameters
-
----
- network/connection.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/network/connection.c b/network/connection.c
-index 544ec3a..59423a9 100644
---- a/network/connection.c
-+++ b/network/connection.c
-@@ -554,7 +554,9 @@ static void path_unregister(void *data)
- 
- static const GDBusMethodTable connection_methods[] = {
- 	{ GDBUS_ASYNC_METHOD("Connect",
--			NULL, NULL, connection_connect) },
-+				GDBUS_ARGS({"uuid", "s"}),
-+				GDBUS_ARGS({"interface", "s"}),
-+				connection_connect) },
- 	{ GDBUS_METHOD("Disconnect",
- 			NULL, NULL, connection_disconnect) },
- 	{ GDBUS_METHOD("GetProperties",
--- 
-1.7.10.4
-

bluetooth.sysconfig

@@ -1,7 +0,0 @@
-############ general 
-## Path:        Hardware/Bluetooth
-## Description: General settings for the Bluetooth device, if set to 'yes' bluetooth is started when udev reports 'added bluetooth device'
-## Type:        yesno
-## Default:     yes
-
-START_BLUETOOTHD=yes

bluez-4.101-new-automake.diff

@@ -1,16 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,10 +1,10 @@
- AC_PREREQ(2.60)
- AC_INIT(bluez, 4.101)
- 
- AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- AM_MAINTAINER_MODE
- 

bluez-4.101.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88f170b52119d576281a20ee98d65319b52cf4fb71aa7a7af1c9e928779baaa0
-size 1039976

bluez-5.4-compilerwarning.diff

@@ -0,0 +1,24 @@
+diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
+index 4b1def3..4b809d9 100644
+--- a/obexd/client/transfer.c
++++ b/obexd/client/transfer.c
+@@ -274,6 +274,7 @@ static const char *status2str(uint8_t status)
+ 	case TRANSFER_STATUS_ERROR:
+ 		return "error";
+ 	}
++	return "unknown";
+ }
+ 
+ static gboolean get_status(const GDBusPropertyTable *property,
+diff --git a/obexd/src/manager.c b/obexd/src/manager.c
+index c0887ca..6571892 100644
+--- a/obexd/src/manager.c
++++ b/obexd/src/manager.c
+@@ -331,6 +331,7 @@ static const char *status2str(uint8_t status)
+ 	case TRANSFER_STATUS_ERROR:
+ 		return "error";
+ 	}
++	return "unknown";
+ }
+ 
+ static gboolean transfer_get_status(const GDBusPropertyTable *property,

bluez-5.8.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:009c29079bcc736b650642de8e05c575d047642b39a2118cf0f0bc4b03a663d0
+size 993212

bluez-coldplug.init

@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# /etc/init.d/bluez-coldplug
-#
-# Copyright (c) 2009, SUSE Linux Products GmbH Nuernberg, Germany.  All rights reserved.
-#
-#
-### BEGIN INIT INFO
-# Provides:		bluez-coldplug
-# Required-Start:	dbus $remote_fs
-# Should-Start:		$network $syslog
-# Required-Stop:	$null
-# Should-Stop:		$null
-# Default-Start:	2 3 5
-# Default-Stop:
-# Short-Description:
-# Description: handles udev coldplug of bluetooth dongles
-### END INIT INFO
-
-. /etc/rc.status
-
-case "$1" in
-	start|restart|try-restart)
-		udevadm trigger --subsystem-match=bluetooth --action=add
-		rc_status -v
-		;;
-	stop)   
-		rc_status -v
-		;;
-	force-reload|reload)
-		rc_status -v
-		;;
-	status)
-		rc_status -v
-		;;
-	*)
-		echo "Usage: $0" \
-		     "{start|stop|status|try-restart|restart|force-reload|reload}"
-		exit 1
-		;;
-esac
-rc_exit

bluez-gstreamer.spec

@@ -1,107 +0,0 @@
-#
-# spec file for package bluez-gstreamer
-#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2010-2012 B1 Systems GmbH, Vohburg, Germany
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-Name:           bluez-gstreamer
-BuildRequires:  flex
-BuildRequires:  libcap-ng-devel
-BuildRequires:  pkgconfig(dbus-1) >= 1.4
-%if 0%{?suse_version} > 1130
-BuildRequires:  pkgconfig(systemd)
-%endif
-Version:        4.101
-Release:        0
-Summary:        Bluetooth Sound Support
-License:        GPL-2.0+
-Group:          Productivity/Multimedia/Sound/Utilities
-Url:            http://www.bluez.org
-Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2
-Source3:        bluetooth.sysconfig
-Source6:        README.SUSE
-Source99:       README.packagers
-# fix for new automake, will not go upstream (upstream is at bluez-5)
-Patch1:         bluez-4.101-new-automake.diff
-BuildRequires:  alsa-devel
-BuildRequires:  automake
-BuildRequires:  check-devel
-BuildRequires:  gstreamer-0_10-plugins-base-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  libtool
-BuildRequires:  libudev-devel
-BuildRequires:  libusb-devel
-BuildRequires:  pkg-config
-BuildRequires:  readline-devel
-BuildRequires:  udev
-BuildRequires:  pkgconfig(glib-2.0) >= 2.28
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(libnl-1)
-Requires:       libbluetooth3 = %{version}
-Provides:       bluez-audio:%{_libdir}/gstreamer-0.10/libgstbluetooth.so
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %( echo `rpm -q --queryformat %%{version} udev` ) < 144
-%define OLD_UDEV 1
-%else
-%define OLD_UDEV 0
-%endif
-
-%description
-The package contains libraries for using bluetooth audio services.
-
-The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA.
-
-%prep
-%setup -n bluez-%{version} -q
-%patch1 -p1
-cp %{SOURCE6} .
-
-%build
-autoreconf -fiv
-%configure --with-pic \
-			--libexecdir=/lib \
-			--enable-gstreamer	\
-			--enable-alsa		\
-			--enable-usb		\
-			--enable-tools		\
-			--enable-bccmd		\
-			--enable-hid2hci	\
-			--enable-dfutool	\
-			--enable-cups		\
-			--enable-test		\
-			--enable-pand		\
-			--enable-dund		\
-			--enable-wiimote	\
-			--enable-datafiles	\
-			--enable-pcmcia
-
-make %{?_smp_mflags} all V=1
-
-%install
-%make_install
-rm -rf %{buildroot}%{_prefix}/[^l]* %{buildroot}/[^u]* %{buildroot}/%{_libdir}/[^g]*
-rm -rf %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/%{_libdir}/*bluetooth* %{buildroot}%{_prefix}/include
-rm -rf %{buildroot}%{_prefix}/lib/udev %{buildroot}%{_prefix}/lib/systemd
-rm %{buildroot}/%{_libdir}/*/*.la
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-, root, root)
-%{_libdir}/gstreamer-*/*.so
-
-%changelog

bluez.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Aug 16 18:43:49 UTC 2013 - seife+obs@b1-systems.com
+
+- update to bluez-5.8
+  * changelog is in the package
+
+-------------------------------------------------------------------
+Thu Aug 15 06:36:45 UTC 2013 - seife+obs@b1-systems.com
+
+- update to bluez-5.4
+  Huge, incompatible update. Some points:
+  * hcidump merged
+  * obexd merged
+  * no unix socket anymore (only d-bus)
+  * libbluetooth and bluez-devel is *deprecated* and will be
+    removed. Only included for now to keep the breakage smaller.
+
 -------------------------------------------------------------------
 Wed Aug 14 14:00:39 UTC 2013 - guillaume@opensuse.org
 

bluez.spec

@@ -20,32 +20,25 @@
 Name:           bluez
 BuildRequires:  flex
 BuildRequires:  libcap-ng-devel
+BuildRequires:  systemd-devel
 BuildRequires:  pkgconfig(dbus-1) >= 1.4
-%if 0%{?suse_version} > 1140
-BuildRequires:  systemd
 %{?systemd_requires}
-%define has_systemd 1
+Version:        5.8
-%endif
-Version:        4.101
 Release:        0
 Summary:        Bluetooth Stack for Linux
 License:        GPL-2.0+
 Group:          Hardware/Mobile
 Url:            http://www.bluez.org
-Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2
+Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
-Source2:        bluez-coldplug.init
-Source3:        bluetooth.sysconfig
 Source5:        baselibs.conf
 Source6:        README.SUSE
 Source7:        bluetooth.modprobe
 Source99:       README.packagers
-# already fixed upstream
+Patch1:         bluez-5.4-compilerwarning.diff
-Patch0:         0001-network-fix-network-Connect-method-parameters.patch
-# fix for new automake, will not go upstream (upstream is at bluez-5)
-Patch1:         bluez-4.101-new-automake.diff
 BuildRequires:  alsa-devel
 BuildRequires:  automake
 BuildRequires:  check-devel
+BuildRequires:  libical-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  libtool
 BuildRequires:  libudev-devel
@@ -55,32 +48,21 @@ BuildRequires:  readline-devel
 BuildRequires:  udev
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
 BuildRequires:  pkgconfig(libnl-1)
-Requires:       libbluetooth3 = %{version}
 Recommends:     sbc
 Provides:       bluez-utils = 3.36
 Obsoletes:      bluez-utils <= 3.36
 Provides:       bluez-audio = 3.36
 Obsoletes:      bluez-audio <= 3.36
+Obsoletes:      bluez-hcidump < 5.0
+Provides:       bluez-hcidump = %{version}
+Obsoletes:      obexd-client < 5.0
+Provides:       obexd-client = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %( echo `rpm -q --queryformat %%{version} udev` ) < 144
-%define OLD_UDEV 1
-%else
-%define OLD_UDEV 0
-%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
-%define NEW_UDEV 1
-%else
-%define NEW_UDEV 0
-%endif
-%endif
 
 # In openSUSE 11.3 there is upstream compliant CUPS 1.4
 # which means to have a fixed "/usr/lib/cups/" directory
 # on all platforms (see Novell/Suse Bugzilla bnc#575544):
-%if 0%{?suse_version} > 1120
 %define cups_lib_dir %{_prefix}/lib/cups
-%else
-%define cups_lib_dir %{_libdir}/cups
-%endif
 
 %description
 The Bluetooth stack for Linux.
@@ -109,105 +91,49 @@ Bluetooth protocol stack libraries.
 Summary:        CUPS Driver for Bluetooth Printers
 License:        GPL-2.0+
 Group:          Hardware/Printing
-Requires:       libbluetooth3 = %{version}
+#Requires:       libbluetooth3 = %{version}
 
 %description cups
 Contains the files required by CUPS for printing to Bluetooth-connected
 printers.
 
+# disabled for now
 %package test
 Summary:        Tools for testing of various Bluetooth-functions
 License:        GPL-2.0+ and MIT
 Group:          Development/Tools/Debuggers
 Requires:       dbus-1-python
-Requires:       libbluetooth3 = %{version}
+#Requires:       libbluetooth3 = %{version}
 Requires:       python-gobject2
 
 %description test
 Contains a few tools for testing various bluetooth functions. The
 BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 
-%package alsa
-Summary:        Bluetooth Sound Support
-License:        GPL-2.0+
-Group:          Productivity/Multimedia/Sound/Utilities
-Requires:       libbluetooth3 = %{version}
-Provides:       bluez-audio:%{_libdir}/alsa-lib/libasound_module_pcm_bluetooth.so
-
-%description alsa
-The package contains libraries for using bluetooth audio services.
-
-The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA.
-
-%package compat
-Summary:        Bluetooth Stack for Linux
-License:        GPL-2.0+
-Group:          Hardware/Mobile
-Requires:       libbluetooth3 = %{version}
-
-%description compat
-The Bluetooth stack for Linux. This package contains older and partly
-deprecated binaries that might still be needed for compatibility.
-
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
+
 cp %{SOURCE6} .
 mkdir dbus-apis
 cp -a doc/*.txt dbus-apis/
 
 %build
-autoreconf -fiv
+# autoreconf -fiv
 %configure --with-pic \
-%if 0%{?has_systemd}
+	--enable-pie		\
-			--with-systemdunitdir=%{_unitdir} \
+	--enable-library	\
-%endif
-			--libexecdir=/lib \
-			--enable-gstreamer	\
-			--enable-alsa		\
 	--enable-usb		\
 	--enable-tools		\
-			--enable-bccmd		\
-			--enable-hid2hci	\
-			--enable-dfutool	\
 	--enable-cups		\
 	--enable-test		\
-			--enable-pand		\
+	--enable-datafiles
-			--enable-dund		\
-			--enable-wiimote	\
-			--enable-datafiles	\
-			--enable-pcmcia
 
 make %{?_smp_mflags} all V=1
 
 %install
 %make_install
-# bluez-test
-cd test
-install --mode=0755	\
-	simple-agent	\
-	simple-service	\
-	list-devices	\
-	test-audio	\
-	test-adapter	\
-	test-device	\
-	test-discovery	\
-	test-input	\
-	test-manager	\
-	test-network	\
-	test-serial	\
-	test-service	\
-	test-telephony	\
-	%{buildroot}/%{_bindir}/
-cd ..
 rm -v %{buildroot}/%{_libdir}/*.la
-rm -rvf %{buildroot}/%{_libdir}/gstreamer-*
-rm -v %{buildroot}/%{_libdir}/alsa-lib/*.la
-%if ! 0%{?has_systemd}
-install --mode=0755 -D %{SOURCE2} %{buildroot}/%{_sysconfdir}/init.d/bluez-coldplug
-%endif
-install --mode=0644 -D %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.bluetooth
 install --mode=0644 -D %{SOURCE7} %{buildroot}/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
 # In openSUSE 11.3 there is upstream compliant CUPS 1.4
 # which means to have a fixed "/usr/lib/cups/" directory
@@ -230,39 +156,23 @@ make check
 rm -rf %{buildroot}
 
 %pre
-%if 0%{?has_systemd}
 %service_add_pre bluetooth.service
-%endif
 
 %post
 # todo: check if this is still obeyed / needed with systemd
 %{fillup_only -n bluetooth}
-%if 0%{?has_systemd}
 # We need the bluez systemd service enabled at any time. It won't start up
 # on it's own, as it is triggered by udev in the end (bnc#796671)
 /bin/systemctl enable bluetooth.service 2>&1 || :
 /bin/systemctl daemon-reload >/dev/null 2>&1 || : 
-%else
-%{insserv_force_if_yast bluez-coldplug}
-%endif
 
 %preun
-%if 0%{?has_systemd}
 %service_del_preun bluetooth.service
-%else
-%stop_on_removal bluez-coldplug
-%endif
 
 %postun
-%{insserv_cleanup}
-%if 0%{?has_systemd}
 %service_del_postun bluetooth.service
-%else
-%{insserv_cleanup}
-%endif
 
 %post -n libbluetooth3 -p /sbin/ldconfig
-
 %postun -n libbluetooth3 -p /sbin/ldconfig
 
 %files
@@ -273,49 +183,39 @@ rm -rf %{buildroot}
 %{_bindir}/rfcomm
 %{_bindir}/sdptool
 %{_bindir}/ciptool
-%{_bindir}/dfutool
+%{_bindir}/hciattach
-%{_bindir}/gatttool
+%{_bindir}/hciconfig
-%{_sbindir}/hciattach
+%dir /usr/lib/bluetooth
-%{_sbindir}/hciconfig
+/usr/lib/bluetooth/bluetoothd
-%{_sbindir}/bluetoothd
+/usr/lib/bluetooth/obexd
-#%{_sbindir}/hid2hci
+%{_bindir}/bluetoothctl
-%{_sbindir}/bccmd
+%{_bindir}/btmon
-%if 0%{NEW_UDEV}
+%{_bindir}/hcidump
+%{_bindir}/bccmd
 %{_prefix}/lib/udev/
-%else
+%doc %{_mandir}/man1/hcidump.1.gz
-/lib/udev/
+%doc %{_mandir}/man1/hciattach.1.gz
-%endif
+%doc %{_mandir}/man1/hciconfig.1.gz
-%if 0%{OLD_UDEV}
-%dir %{_sysconfdir}/udev/rules.d
-%config %{_sysconfdir}/udev/rules.d/*
-%endif
-%doc %{_mandir}/man8/hciattach.8.gz
-%doc %{_mandir}/man8/hciconfig.8.gz
 %doc %{_mandir}/man8/bluetoothd.8.gz
-%doc %{_mandir}/man8/hid2hci.8.gz
+%doc %{_mandir}/man1/hid2hci.1.gz
-%doc %{_mandir}/man8/bccmd.8.gz
+%doc %{_mandir}/man1/bccmd.1.gz
-%doc %{_mandir}/man8/l2ping.8.gz
+%doc %{_mandir}/man1/l2ping.1.gz
 %doc %{_mandir}/man1/hcitool.1.gz
 %doc %{_mandir}/man1/sdptool.1.gz
 %doc %{_mandir}/man1/ciptool.1.gz
 %doc %{_mandir}/man1/rfcomm.1.gz
-%doc %{_mandir}/man1/dfutool.1.gz
-%doc %{_mandir}/man1/hciemu.1.gz
 %doc %{_mandir}/man1/rctest.1.gz
-%dir %{_sysconfdir}/bluetooth
+#%dir %{_sysconfdir}/bluetooth
-%config(noreplace) %{_sysconfdir}/bluetooth/main.conf
+#%config(noreplace) %{_sysconfdir}/bluetooth/main.conf
-%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
+#%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
-%{_localstatedir}/adm/fillup-templates/sysconfig.bluetooth
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %dir %{_localstatedir}/lib/bluetooth
 %dir %{_sysconfdir}/modprobe.d
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
-%if 0%{?has_systemd}
 %{_unitdir}/bluetooth.service
-%else
+/usr/lib/systemd/user/obex.service 
-%{_sysconfdir}/init.d/bluez-coldplug
-%endif
 %{_datadir}/dbus-1/system-services/org.bluez.service
+%{_datadir}/dbus-1/services/org.bluez.obex.service
 
 %files devel
 %defattr(-, root, root)
@@ -336,34 +236,10 @@ rm -rf %{buildroot}
 
 %files test
 %defattr(-,root,root)
-%{_sbindir}/hciemu
+#{_bindir}/hciemu
 %{_bindir}/l2test
 %{_bindir}/rctest
-%{_bindir}/list-devices
+%dir %{_libdir}/bluez
-%{_bindir}/simple-agent
+%{_libdir}/bluez/test
-%{_bindir}/simple-service
-%{_bindir}/test-adapter
-%{_bindir}/test-audio
-%{_bindir}/test-device
-%{_bindir}/test-discovery
-%{_bindir}/test-input
-%{_bindir}/test-manager
-%{_bindir}/test-network
-%{_bindir}/test-serial
-%{_bindir}/test-service
-%{_bindir}/test-telephony
-
-%files alsa
-%defattr(-,root,root)
-%dir %{_datadir}/alsa
-%config %{_datadir}/alsa/bluetooth.conf
-%{_libdir}/alsa-lib/*.so
-
-%files compat
-%defattr(-,root,root)
-%{_bindir}/dund
-%{_bindir}/pand
-%doc %{_mandir}/man1/pand.1.gz
-%doc %{_mandir}/man1/dund.1.gz
 
 %changelog