From: Jakub Bogusz Date: Fri, 15 Jun 2012 18:47:40 +0000 (+0000) Subject: - updated to 4.100 X-Git-Tag: auto/th/bluez-4_100-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluez.git;a=commitdiff_plain;h=0ff69826bc6f1d4f65e6126cd60ca9b6d2a771cf - updated to 4.100 - updated systemd patch (mostly obsolete, now it just adds missing file) - removed obsolete udev-deprecated patch Changed files: bluez-systemd.patch -> 1.2 bluez.spec -> 1.92 udev-deprecated.patch -> 1.2 --- diff --git a/bluez-systemd.patch b/bluez-systemd.patch index a036423..dd2bded 100644 --- a/bluez-systemd.patch +++ b/bluez-systemd.patch @@ -1,121 +1,8 @@ -From 0080ce8a37152b0ee7750799e01de3bf810f8caf Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Wed, 21 Jul 2010 19:20:44 +0200 -Subject: [PATCH] systemd: install systemd unit files - -This also enables bus activation for bluetoothd, but only if systemd is -running. Only if that's the case we can make sure in a race-free fashion -that bluetoothd is not started twice at the same time. ---- - Makefile.am | 21 ++++++++++++++++++--- - configure.ac | 9 +++++++++ - scripts/.gitignore | 1 + - scripts/bluetooth.service.in | 13 +++++++++++++ - scripts/org.bluez.service | 5 +++++ - 5 files changed, 46 insertions(+), 3 deletions(-) - create mode 100644 scripts/.gitignore - create mode 100644 scripts/bluetooth.service.in - create mode 100644 scripts/org.bluez.service - -diff --git a/Makefile.am b/Makefile.am -index aecc8f2..6e18003 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -387,10 +387,25 @@ endif - rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file))) - endif - -+if HAVE_SYSTEMD -+systemdsystemunit_DATA = \ -+ scripts/bluetooth.service -+ -+scripts/bluetooth.service: scripts/bluetooth.service.in -+ @$(SED) -e "s|\@sbindir\@|$(sbindir)|" $< >$@ -+ -+dbussystemservicesdir = $(datadir)/dbus-1/system-services -+ -+dbussystemservices_DATA = \ -+ scripts/org.bluez.service -+ -+endif -+ - CLEANFILES += $(rules_DATA) - - EXTRA_DIST += scripts/bluetooth.rules \ -- scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules -+ scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \ -+ scripts/bluetooth.service.in scripts/org.bluez.service - - EXTRA_DIST += doc/manager-api.txt \ - doc/adapter-api.txt doc/device-api.txt \ -@@ -417,9 +432,9 @@ pkgconfigdir = $(libdir)/pkgconfig - - pkgconfig_DATA = bluez.pc - --DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles -+DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --with-systemdsystemunitdir= - --DISTCLEANFILES = $(pkgconfig_DATA) -+DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service - - MAINTAINERCLEANFILES = Makefile.in \ - aclocal.m4 configure config.h.in config.sub config.guess \ -diff --git a/configure.ac b/configure.ac -index bc2658c..b4502ab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,5 +71,14 @@ if (test -n "${path_systemdunit}"); then - fi - AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") - -+# systemd -+ -+AC_ARG_WITH([systemdsystemunitdir], -+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), -+ [], -+ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) -+ - AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml - src/bluetoothd.8 src/bluetooth.service bluez.pc) -diff --git a/scripts/.gitignore b/scripts/.gitignore -new file mode 100644 -index 0000000..4b9f765 --- /dev/null -+++ b/scripts/.gitignore -@@ -0,0 +1 @@ -+bluetooth.service -diff --git a/scripts/bluetooth.service.in b/scripts/bluetooth.service.in -new file mode 100644 -index 0000000..d0089ea ---- /dev/null -+++ b/scripts/bluetooth.service.in -@@ -0,0 +1,13 @@ -+[Unit] -+Description=Bluetooth Manager -+After=syslog.target -+ -+[Service] -+Type=dbus -+BusName=org.bluez -+ExecStart=@sbindir@/bluetoothd -n -+StandardOutput=syslog -+ -+[Install] -+WantedBy=bluetooth.target -+Alias=dbus-org.bluez.service -diff --git a/scripts/org.bluez.service b/scripts/org.bluez.service -new file mode 100644 -index 0000000..dd7ae8f ---- /dev/null -+++ b/scripts/org.bluez.service ++++ b/src/org.bluez.service @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=org.bluez +Exec=/bin/false +User=root +SystemdService=dbus-org.bluez.service --- -1.7.6 - diff --git a/bluez.spec b/bluez.spec index 44db24a..e9bf56e 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,13 +1,13 @@ Summary: Bluetooth utilities Summary(pl.UTF-8): Narzędzia Bluetooth Name: bluez -Version: 4.99 -Release: 6 +Version: 4.100 +Release: 1 License: GPL v2+ Group: Applications/System #Source0Download: http://www.bluez.org/download.html Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2 -# Source0-md5: 2387053eb5a7b02f37df4871df022a02 +# Source0-md5: 54809d476c52665ff64594b6828016b5 Source1: %{name}.init Source2: %{name}.sysconfig Source3: dund.init @@ -17,15 +17,14 @@ Patch0: %{name}-etc_dir.patch Patch1: %{name}-wacom-mode-2.patch Patch2: %{name}-systemd.patch Patch3: %{name}-audio_socket.patch -Patch4: udev-deprecated.patch URL: http://www.bluez.org/ BuildRequires: alsa-lib-devel >= 1.0.10-1 BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison BuildRequires: check-devel >= 0.9.6 -BuildRequires: dbus-devel >= 1.0 -BuildRequires: glib2-devel >= 1:2.16 +BuildRequires: dbus-devel >= 1.4 +BuildRequires: glib2-devel >= 1:2.28 BuildRequires: gstreamer-devel >= 0.10.30 BuildRequires: gstreamer-plugins-base-devel >= 0.10 BuildRequires: libcap-ng-devel @@ -38,7 +37,8 @@ BuildRequires: rpmbuild(macros) >= 1.626 BuildRequires: udev-devel Requires(post,preun,postun): systemd-units >= 38 Requires: %{name}-libs = %{version}-%{release} -Requires: glib2 >= 1:2.16 +Requires: dbus-libs >= 1.4 +Requires: glib2 >= 1:2.28 Requires: hwdata >= 0.225 Requires: rc-scripts Requires: systemd-units >= 38 @@ -182,7 +182,6 @@ aplikacji Bluetooth. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build %{__libtoolize} @@ -192,7 +191,7 @@ aplikacji Bluetooth. %{__automake} %configure \ --with-ouifile=%{_datadir}/hwdata/oui.txt \ - --with-systemdsystemunitdir=%{systemdunitdir} \ + --with-systemdunitdir=%{systemdunitdir} \ --disable-silent-rules \ --enable-shared \ --enable-static \ @@ -204,6 +203,7 @@ aplikacji Bluetooth. --enable-dbusoob \ --enable-dfutool \ --enable-dund \ + --enable-gatt \ --enable-gstreamer \ --enable-health \ --enable-hid2hci \ @@ -317,7 +317,6 @@ fi %{_datadir}/dbus-1/system-services/org.bluez.service %attr(755,root,root) %{udevdir}/bluetooth_serial %attr(755,root,root) %{udevdir}/hid2hci -%{udevdir}/rules.d/97-bluetooth.rules %{udevdir}/rules.d/97-bluetooth-hid2hci.rules %{udevdir}/rules.d/97-bluetooth-serial.rules %{_mandir}/man1/ciptool.1* @@ -338,7 +337,7 @@ fi %files -n alsa-plugins-bluetooth %defattr(644,root,root,755) %{_sysconfdir}/alsa/bluetooth.conf -%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_bluetooth.so +%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_bluetooth.so* %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_bluetooth.so %files -n cups-backend-bluetooth diff --git a/udev-deprecated.patch b/udev-deprecated.patch deleted file mode 100644 index 8e4b3e8..0000000 --- a/udev-deprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bluez-4.99/tools/hid2hci.c~ 2011-05-03 10:20:36.000000000 +0200 -+++ bluez-4.99/tools/hid2hci.c 2012-06-02 17:30:34.286326842 +0200 -@@ -291,7 +291,7 @@ - if (udev == NULL) - goto exit; - -- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); -+ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); - udev_dev = udev_device_new_from_syspath(udev, syspath); - if (udev_dev == NULL) { - fprintf(stderr, "error: could not find '%s'\n", devpath);