From 3829dbd6c8cedf69554f93e8e634e28ea108a1e1ddcf094d5b1e3edb2bb0e9d7 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 29 Sep 2008 15:29:15 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=7

---
 bluez-4.7.tar.bz2       |  3 ---
 bluez-4.8-buildfix.diff | 13 +++++++++++++
 bluez-4.8.tar.bz2       |  3 +++
 bluez.changes           | 14 ++++++++++++++
 bluez.spec              | 17 ++++++++++++++---
 5 files changed, 44 insertions(+), 6 deletions(-)
 delete mode 100644 bluez-4.7.tar.bz2
 create mode 100644 bluez-4.8-buildfix.diff
 create mode 100644 bluez-4.8.tar.bz2

diff --git a/bluez-4.7.tar.bz2 b/bluez-4.7.tar.bz2
deleted file mode 100644
index eb8e89b..0000000
--- a/bluez-4.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4819ea0219a1f778cd005baea363ce87a038181d2bfe7e657eddf37164be1079
-size 716218
diff --git a/bluez-4.8-buildfix.diff b/bluez-4.8-buildfix.diff
new file mode 100644
index 0000000..68e12e4
--- /dev/null
+++ b/bluez-4.8-buildfix.diff
@@ -0,0 +1,13 @@
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index e95662a..3b258a3 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -34,7 +34,7 @@ endif
+ AM_LDFLAGS = -module -avoid-version -no-undefined \
+ 			-export-symbols-regex bluetooth_plugin_desc
+ 
+-AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
++AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
+ 					@GDBUS_CFLAGS@ @NETLINK_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src
diff --git a/bluez-4.8.tar.bz2 b/bluez-4.8.tar.bz2
new file mode 100644
index 0000000..7c10e05
--- /dev/null
+++ b/bluez-4.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4fb93e42a9bb4b887725ab5fd83b75996792ff5ed810ab1e0991d7c9ad8750e
+size 716164
diff --git a/bluez.changes b/bluez.changes
index 47a2975..fd9a65b 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Sep 29 09:36:31 CEST 2008 - seife@suse.de
+
+- update to bluez-4.8:
+  - fix two bluetoothd crashes during device pairing
+  - reenable HAL plugin, no need for libhal anymore
+  - hciconfig and hcitool now show all extended features pages
+    (important because page 1 indicates simple pairing support)
+
+-------------------------------------------------------------------
+Sat Sep 27 07:04:45 CEST 2008 - seife@suse.de
+
+- fix a crash when e.g. connecting a new input device
+
 -------------------------------------------------------------------
 Fri Sep 26 12:07:21 CEST 2008 - seife@suse.de
 
diff --git a/bluez.spec b/bluez.spec
index e0b7186..ff7fba3 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bluez (Version 4.7)
+# spec file for package bluez (Version 4.8)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,7 +24,7 @@ BuildRequires:  glib2-devel libnl-devel libusb-devel
 BuildRequires:  alsa-devel libsndfile-devel
 BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
 Url:            http://www.bluez.org
-Version:        4.7
+Version:        4.8
 Release:        1
 Summary:        Bluetooth Stack for Linux
 Group:          Hardware/Mobile
@@ -39,6 +39,7 @@ Source4:        bluetooth.sh
 Source5:        org.bluez.service
 Source6:        README.SUSE
 Patch1:         bluez-utils-3.8-bluetooth.rules.diff
+Patch2:         bluez-4.8-buildfix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       bluez-utils = 3.36
 Obsoletes:      bluez-utils <= 3.36
@@ -164,12 +165,13 @@ Authors:
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p1
 cp %{S:1} scripts/
 cp %{S:6} .
 %{?suse_update_config:%{suse_update_config -f . }}
 
 %build
-#autoreconf -sfi
+autoreconf -sfi
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --libdir=%_libdir --localstatedir=%_localstatedir
 #make
 #%build
@@ -257,6 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/bluetooth/plugins
 %{_libdir}/bluetooth/plugins/audio.so
 %{_libdir}/bluetooth/plugins/input.so
+%{_libdir}/bluetooth/plugins/hal.so
 %{_libdir}/bluetooth/plugins/netlink.so
 %{_libdir}/bluetooth/plugins/network.so
 %{_libdir}/bluetooth/plugins/serial.so
@@ -334,6 +337,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-*/*.so
 
 %changelog
+* Mon Sep 29 2008 seife@suse.de
+- update to bluez-4.8:
+  - fix two bluetoothd crashes during device pairing
+  - reenable HAL plugin, no need for libhal anymore
+  - hciconfig and hcitool now show all extended features pages
+  (important because page 1 indicates simple pairing support)
+* Sat Sep 27 2008 seife@suse.de
+- fix a crash when e.g. connecting a new input device
 * Fri Sep 26 2008 seife@suse.de
 - update to bluez-4.7:
   - Fix pairing and service discovery logic.