From bcb79a3b8e34aa8c624cd7c92f8e5e0579804d550a53f55b5f34044f7ceaecd3 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@novell.slipkontur.de>
Date: Thu, 5 May 2011 09:59:41 +0000
Subject: [PATCH] Accepting request 69676 from home:seife:testing

- update to bluez-4.93:
  - Fix issue with property type and Health Main channel.
  - Fix issue with crash when removing devices.
  - Add support for hid2hci and udev integration.
- disable 001-remove-rule-dell-mouse.patch for now

OBS-URL: https://build.opensuse.org/request/show/69676
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=98
---
 bluez-4.92.tar.bz2      |  3 ---
 bluez-4.93.tar.bz2      |  3 +++
 bluez-gstreamer.changes |  9 +++++++++
 bluez-gstreamer.spec    |  4 ++--
 bluez.changes           |  9 +++++++++
 bluez.spec              | 14 ++++++++++----
 6 files changed, 33 insertions(+), 9 deletions(-)
 delete mode 100644 bluez-4.92.tar.bz2
 create mode 100644 bluez-4.93.tar.bz2

diff --git a/bluez-4.92.tar.bz2 b/bluez-4.92.tar.bz2
deleted file mode 100644
index 8acfb13..0000000
--- a/bluez-4.92.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:821e45c5eb8cde1e3c3daa37e64690f249ef896fccd05ebb5bd67afc52482600
-size 932839
diff --git a/bluez-4.93.tar.bz2 b/bluez-4.93.tar.bz2
new file mode 100644
index 0000000..b87a11e
--- /dev/null
+++ b/bluez-4.93.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:801395e991c7c8e8acf24d5afc890b6b1a1a755099e2d46895951c61d0fd4182
+size 934148
diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes
index 4d21bc2..7e99419 100644
--- a/bluez-gstreamer.changes
+++ b/bluez-gstreamer.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May  4 20:39:21 UTC 2011 - seife+obs@b1-systems.com
+
+- update to bluez-4.93:
+  - Fix issue with property type and Health Main channel.
+  - Fix issue with crash when removing devices.
+  - Add support for hid2hci and udev integration.
+- disable 001-remove-rule-dell-mouse.patch for now
+
 -------------------------------------------------------------------
 Tue Apr 26 07:48:45 UTC 2011 - seife+obs@b1-systems.com
 
diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec
index 6bf92b3..fc22aee 100644
--- a/bluez-gstreamer.spec
+++ b/bluez-gstreamer.spec
@@ -29,8 +29,9 @@ BuildRequires:  libnl-devel libusb-devel
 BuildRequires:  alsa-devel libsndfile-devel pkg-config udev
 BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
 BuildRequires:  readline-devel
+BuildRequires:  libudev-devel
 Url:            http://www.bluez.org
-Version:        4.92
+Version:        4.93
 Release:        1
 Summary:        Bluetooth Sound Support
 Group:          Productivity/Multimedia/Sound/Utilities
@@ -90,7 +91,6 @@ CFLAGS="$RPM_OPT_FLAGS -g" \
 			--enable-pand		\
 			--enable-dund		\
 			--enable-configfiles	\
-			--enable-attrib		\
 			--enable-pcmcia \
 			%{?with_libcapng}
 make %{?_smp_mflags} all V=1
diff --git a/bluez.changes b/bluez.changes
index 4d21bc2..7e99419 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May  4 20:39:21 UTC 2011 - seife+obs@b1-systems.com
+
+- update to bluez-4.93:
+  - Fix issue with property type and Health Main channel.
+  - Fix issue with crash when removing devices.
+  - Add support for hid2hci and udev integration.
+- disable 001-remove-rule-dell-mouse.patch for now
+
 -------------------------------------------------------------------
 Tue Apr 26 07:48:45 UTC 2011 - seife+obs@b1-systems.com
 
diff --git a/bluez.spec b/bluez.spec
index f4fec86..1d020f1 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -28,8 +28,9 @@ BuildRequires:  glib2-devel >= 2.16
 BuildRequires:  libnl-devel libusb-devel
 BuildRequires:  alsa-devel libsndfile-devel pkg-config udev
 BuildRequires:  readline-devel
+BuildRequires:  libudev-devel
 Url:            http://www.bluez.org
-Version:        4.92
+Version:        4.93
 Release:        1
 Summary:        Bluetooth Stack for Linux
 Group:          Hardware/Mobile
@@ -56,6 +57,10 @@ Requires:       libbluetooth3 = %{version}
 %else
 %define OLD_UDEV 0
 %endif
+
+# needed to get around some stupid checks...
+%define _suse_os_install_post /usr/lib/rpm/brp-compress /usr/lib/rpm/brp-strip-debug /usr/lib/rpm/brp-symlink
+
 # 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):
@@ -182,7 +187,9 @@ Authors:
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
+# disabled the patch because it does no longer cleanly apply and the rule has
+# changed significantly anyway. I'll keep it until i get confirmation in bugzilla.
+##%%patch2 -p1
 cp %{S:6} .
 %{?suse_update_config:%{suse_update_config -f . }}
 mkdir dbus-apis
@@ -209,7 +216,6 @@ CFLAGS="$RPM_OPT_FLAGS -g" \
 			--enable-pand		\
 			--enable-dund		\
 			--enable-configfiles	\
-			--enable-attrib		\
 			--enable-pcmcia \
 			%{?with_libcapng}
 make %{?_smp_mflags} all V=1
@@ -282,7 +288,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/hciattach
 %{_sbindir}/hciconfig
 %{_sbindir}/bluetoothd
-%{_sbindir}/hid2hci
+#%{_sbindir}/hid2hci
 %{_sbindir}/bccmd
 %dir /lib/udev
 /lib/udev/*