Hello community,
here is the log from the commit of package bluez for openSUSE:Factory checked
in at 2013-09-16 09:18:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bluez (Old)
and /work/SRC/openSUSE:Factory/.bluez.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2013-08-15
14:54:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2013-09-16
09:18:37.000000000 +0200
@@ -1,0 +2,22 @@
+Fri Aug 16 18:43:49 UTC 2013 - seife+...@b1-systems.com
+
+- update to bluez-5.8
+ * changelog is in the package
+
+-------------------------------------------------------------------
+Thu Aug 15 06:36:45 UTC 2013 - seife+...@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.
+- dropped patches (no longer needed):
+ * 0001-network-fix-network-Connect-method-parameters.patch
+ * bluez-4.101-new-automake.diff
+- new patch to suppress a stupid compiler warning:
+ * bluez-5.4-compilerwarning.diff
+
+-------------------------------------------------------------------
Old:
----
0001-network-fix-network-Connect-method-parameters.patch
bluetooth.sysconfig
bluez-4.101-new-automake.diff
bluez-4.101.tar.bz2
bluez-coldplug.init
bluez-gstreamer.changes
bluez-gstreamer.spec
New:
----
bluez-5.4-compilerwarning.diff
bluez-5.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.FbDE1o/_old 2013-09-16 09:18:38.000000000 +0200
+++ /var/tmp/diff_new_pack.FbDE1o/_new 2013-09-16 09:18:38.000000000 +0200
@@ -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
-%endif
-Version: 4.101
+Version: 5.8
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
-Source2: bluez-coldplug.init
-Source3: bluetooth.sysconfig
+Source:
http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
Source5: baselibs.conf
Source6: README.SUSE
Source7: bluetooth.modprobe
Source99: README.packagers
-# already fixed upstream
-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
+Patch1: bluez-5.4-compilerwarning.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: 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 @@
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}
- --with-systemdunitdir=%{_unitdir} \
-%endif
- --libexecdir=/lib \
- --enable-gstreamer \
- --enable-alsa \
+ --enable-pie \
+ --enable-library \
--enable-usb \
--enable-tools \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-dfutool \
--enable-cups \
--enable-test \
- --enable-pand \
- --enable-dund \
- --enable-wiimote \
- --enable-datafiles \
- --enable-pcmcia
+ --enable-datafiles
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 @@
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 @@
%{_bindir}/rfcomm
%{_bindir}/sdptool
%{_bindir}/ciptool
-%{_bindir}/dfutool
-%{_bindir}/gatttool
-%{_sbindir}/hciattach
-%{_sbindir}/hciconfig
-%{_sbindir}/bluetoothd
-#%{_sbindir}/hid2hci
-%{_sbindir}/bccmd
-%if 0%{NEW_UDEV}
+%{_bindir}/hciattach
+%{_bindir}/hciconfig
+%dir /usr/lib/bluetooth
+/usr/lib/bluetooth/bluetoothd
+/usr/lib/bluetooth/obexd
+%{_bindir}/bluetoothctl
+%{_bindir}/btmon
+%{_bindir}/hcidump
+%{_bindir}/bccmd
%{_prefix}/lib/udev/
-%else
-/lib/udev/
-%endif
-%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}/man1/hcidump.1.gz
+%doc %{_mandir}/man1/hciattach.1.gz
+%doc %{_mandir}/man1/hciconfig.1.gz
%doc %{_mandir}/man8/bluetoothd.8.gz
-%doc %{_mandir}/man8/hid2hci.8.gz
-%doc %{_mandir}/man8/bccmd.8.gz
-%doc %{_mandir}/man8/l2ping.8.gz
+%doc %{_mandir}/man1/hid2hci.1.gz
+%doc %{_mandir}/man1/bccmd.1.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
-%config(noreplace) %{_sysconfdir}/bluetooth/main.conf
-%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
-%{_localstatedir}/adm/fillup-templates/sysconfig.bluetooth
+#%dir %{_sysconfdir}/bluetooth
+#%config(noreplace) %{_sysconfdir}/bluetooth/main.conf
+#%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
%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
-%{_sysconfdir}/init.d/bluez-coldplug
-%endif
+/usr/lib/systemd/user/obex.service
%{_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 @@
%files test
%defattr(-,root,root)
-%{_sbindir}/hciemu
+#{_bindir}/hciemu
%{_bindir}/l2test
%{_bindir}/rctest
-%{_bindir}/list-devices
-%{_bindir}/simple-agent
-%{_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
+%dir %{_libdir}/bluez
+%{_libdir}/bluez/test
%changelog
++++++ bluez-5.4-compilerwarning.diff ++++++
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,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
