From 56ab2d814e6a64cf8eec0bfc06755096fa1bb647eae043b8e2ac51177abe2e57 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 10 Jul 2009 14:41:47 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=38

---
 README.SUSE                           |  18 +--
 bluetooth-coldplug.init               |  32 ------
 bluetooth.init                        | 155 --------------------------
 bluetooth.rules                       |   3 -
 bluetooth.sh                          |  50 +--------
 bluetooth.sysconfig                   | 126 +--------------------
 bluez-4.41-as_needed.patch            |  11 --
 bluez-4.42.tar.bz2                    |   3 -
 bluez-4.44-udev-use-helperscript.diff |   9 ++
 bluez-4.45.tar.bz2                    |   3 +
 bluez-gstreamer.changes               |  43 ++++++-
 bluez-gstreamer.spec                  |  30 ++---
 bluez.changes                         |  41 +++++++
 bluez.spec                            |  52 +++------
 org.bluez.service                     |   4 -
 15 files changed, 137 insertions(+), 443 deletions(-)
 delete mode 100644 bluetooth-coldplug.init
 delete mode 100644 bluetooth.init
 delete mode 100644 bluetooth.rules
 delete mode 100644 bluez-4.41-as_needed.patch
 delete mode 100644 bluez-4.42.tar.bz2
 create mode 100644 bluez-4.44-udev-use-helperscript.diff
 create mode 100644 bluez-4.45.tar.bz2
 delete mode 100644 org.bluez.service

diff --git a/README.SUSE b/README.SUSE
index 7adb253..84b3033 100644
--- a/README.SUSE
+++ b/README.SUSE
@@ -3,21 +3,13 @@ Notes about the SUSE bluez packages:
 
 How does bluetoothd get started?
 --------------------------------
-Bluetoothd is started via D-Bus activation. This means: as soon as somebody
-is requesting bluez services via D-Bus, bluetoothd is started.
-Additionally, there is a udev rule that runs /lib/udev/bluetooth.sh every
-time a bluetooth device is plugged into the system. This script sends a
-request via dbus-send to start the bluetoothd.
+Bluetoothd is started via udev. This means: as soon as a bluetooth device
+is inserted, bluetoothd is started with the option "--udev".
 For the case that D-Bus is not yet running during system bootup when the
-adapter is detected, the script creates /dev/shm/bluetooth-adapter-present/
-which is used in a later init script /etc/init.d/bluetooth-coldplug to
-decide if bluetooth services should be started or not.
-
-Of course you can still decide to always start bluetoothd on every boot by
-issuing the "insserv bluetooth" command or enabling it with the YaST2 runlevel
-editor.
+adapter is detected, bluetoothd will quit with exit code 1, udev will notice
+that and then try to restart bluetoothd later.
 
 If you want to prevent starting of the bluetooth service, edit
-/etc/sysconfig/bluetooth and set START_SERVICES to "no".
+/etc/sysconfig/bluetooth and set START_BLUETOOTHD to "no".
 
 Have a lot of fun...
diff --git a/bluetooth-coldplug.init b/bluetooth-coldplug.init
deleted file mode 100644
index d19b8bd..0000000
--- a/bluetooth-coldplug.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Copyright (c) 2008 SuSE Linux Products GmbH, Nuernberg, Germany.
-#
-# Author: Stefan Seyfried <feedback@suse.de>
-# /etc/init.d/bluetooth-coldplug
-#
-### BEGIN INIT INFO
-# Provides:          bluetooth-coldplug
-# Required-Start:    $syslog $remote_fs
-# Should-Start:      dbus
-# Required-Stop:     $syslog $remote_fs
-# Should-Stop:       $null
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Coldplugging of bluetoothd
-# Description:       Starts bluetooth services on boot if an adapter is present.
-### END INIT INFO
-
-STATEFILE=/dev/shm/bluetooth-adapter-present
-INITSCRIPT=/etc/init.d/bluetooth
-CONFIGFILE=/etc/sysconfig/bluetooth
-
-[ -e $STATEFILE ] || exit 0
-[ -e $CONFIGFILE ] && . $CONFIGFILE
-[ x"$START_SERVICES" = xno ] && exit 0
-
-case $1 in
-	reload)	exec $INITSCRIPT "$@" ;;
-	status)	exec $INITSCRIPT "$@" ;;
-esac
-
-exec $INITSCRIPT "$@"
diff --git a/bluetooth.init b/bluetooth.init
deleted file mode 100644
index 01f59d6..0000000
--- a/bluetooth.init
+++ /dev/null
@@ -1,155 +0,0 @@
-#! /bin/sh
-# Copyright (c) 1995-2003 SuSE Linux AG, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Stefan Behlert <feedback@suse.de>, based on
-#         proposals and templates from Marcel Holtmann
-#         and Stefan Reinauer <feedback@suse.de>
-#
-# /etc/init.d/bluetooth
-#   and its symbolic link
-# /(usr/)sbin/rcbluetooth
-#
-### BEGIN INIT INFO
-# Provides:          bluetooth
-# Required-Start:    $syslog $remote_fs
-# Should-Start:      dbus
-# Required-Stop:     $syslog $remote_fs
-# Should-Stop:       $null
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Bluetooth protocol stack services
-# Description:       Bluetooth protocol stack services
-### END INIT INFO
-# 
-
-DAEMON_EXEC=/usr/sbin/bluetoothd
-HID2HCI_EXEC=/usr/sbin/hid2hci
-RFCOMM_EXEC=/usr/bin/rfcomm
-PAND_EXEC=/usr/sbin/pand
-DUND_EXEC=/usr/sbin/dund
-DAEMON_ENABLE=true
-HID2HCI_ENABLE=false
-RFCOMM_ENABLE=true
-PAND_ENABLE=false
-DUND_ENABLE=false
-
-# Check for existence of needed config file and read it
-BLUETOOTH_CONFIG=/etc/sysconfig/bluetooth
-test -r $BLUETOOTH_CONFIG || exit 6
-. $BLUETOOTH_CONFIG
-
-. /etc/rc.status
-
-# Reset status of this service
-rc_reset
-	 
-#	check_service "hcid" "$HCI_START" "$HCI_DAEMON"
-check_service()
-{
-	if [ "$2" = "yes" ]; then
-		printf "%10s  (%s)" "$1" "activated"
-		/sbin/checkproc $3 || rc_failed 7
-		rc_status -v
-	else
-		printf "%10s" "$1"
-		/sbin/checkproc $3 || rc_failed 3
-		rc_status -v
-	fi
-}
-
-case "$1" in
-    start)
-	echo -n "Starting bluetooth: "
-
-	if [ $DAEMON_ENABLE = "yes" ] && [ -x "$DAEMON_EXEC" ] ; then
-		/sbin/checkproc $DAEMON_EXEC || $DAEMON_EXEC  $DAEMON_ARGS
-		echo -n " bluetoothd"
-	fi
-	if [ $HID2HCI_ENABLE != "no" ] && [ -x "$HID2HCI_EXEC" ] ; then
-		$HID2HCI_EXEC $HID2HCI_ARGS > /dev/null 2>&1
-		echo -n " hid2hci"
-	fi
-	if [ $RFCOMM_ENABLE = "yes" ] && [ -x "$RFCOMM_EXEC" ] ; then
-		$RFCOMM_EXEC $RFCOMM_ARGS
-		echo -n " rfcomm"
-	fi
-	if [ $PAND_ENABLE = "yes" ] && [ -x "$PAND_EXEC" ] ; then
-		/sbin/checkproc $PAND_EXEC || $PAND_EXEC $PAND_ARGS
-		echo -n " pand"
-	fi
-	if [ $DUND_ENABLE = "yes" ] && [ -x "$DUND_EXEC" ] ; then
-		/sbin/checkproc $DUND_EXEC || $DUND_EXEC $DUND_ARGS
-		echo -n " dund"
-	fi
-
-	rc_status -v
-	;;
-    stop)
-	echo -n "Shutting down bluetooth ("
-
-	if [ -x $DUND_EXEC ]; then
-		/sbin/killproc -TERM $DUND_EXEC && echo -n " dund"
-	fi
-	if [ -x $PAND_EXEC ]; then
-		/sbin/killproc -TERM $PAND_EXEC && echo -n " pand"
-	fi
-	if [ -x $RFCOMM_EXEC ]; then
-		/sbin/killproc -TERM $RFCOMM_EXEC && echo -n " rfcomm"
-	fi
-	if [ -x $DAEMON_EXEC ]; then
-		/sbin/killproc -TERM $DAEMON_EXEC && echo -n " bluetoothd"
-	fi
-	echo -n ")"
-	rc_status -v
-	;;
-    try-restart)
-	$0 status >/dev/null &&  $0 restart
-	rc_status
-	;;
-    restart)
-	$0 stop
-	$0 start
-	rc_status
-	;;
-    force-reload)
-	echo -n "Reload service BLUETOOTH "
-	$0 stop  &&  $0 start
-	rc_status
-	;;
-    reload)
-	rc_failed 3
-	rc_status -v
-	;;
-    status)
-	echo -n "Checking service bluetooth "
-	if [ $START_SERVICES = 'no' ] ; then
-		echo "(disabled) :"
-	else
-		echo "(enabled) :"
-	fi;
-	check_service "bluetoothd"	"$DAEMON_ENABLE"	"$DAEMON_EXEC"
-	check_service "hid2hci"	"$HID2HCI_ENABLE"	"$HID2HCI_EXEC"
-	check_service "rfcomm"	"$RFCOMM_ENABLE"	"$RFCOMM_EXEC"
-	check_service "pand"	"$PAND_ENABLE"	"$PAND_EXEC"
-	check_service "dund"	"$DUND_ENABLE"	"$DUND_EXEC"
-	if [ $START_SERVICES = 'no' ] ; then
-		rc_failed 3
-	else
-		rc_failed 0
-	fi;
-
-	;;
-    probe)
-	## Optional: Probe for the necessity of a reload, print out the
-	## argument to this init script which is required for a reload.
-	## Note: probe is not (yet) part of LSB (as of 1.2)
-	# test /etc/FOO/FOO.conf -nt /var/run/FOO.pid && echo reload
-	;;
-    *)
-	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
-	exit 1
-	;;
-esac
-rc_exit
-
diff --git a/bluetooth.rules b/bluetooth.rules
deleted file mode 100644
index 4e7f1ea..0000000
--- a/bluetooth.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# bluetooth subsystem
-SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
-
diff --git a/bluetooth.sh b/bluetooth.sh
index dc36a19..8fe9a29 100644
--- a/bluetooth.sh
+++ b/bluetooth.sh
@@ -1,47 +1,9 @@
-#!/bin/bash
-# $id$
-# Bluetooth hotplug policy agent for Linux 2.6 kernels
-#
-# Bluetooth hotplug params include:
-#
-#        ACTION=%s [add or remove]
-#        SUBSYSTEM=bluetooth
-#
-[ x"$SUBSYSTEM" = xbluetooth ] || {
-	echo "bad invocation: SUBSYSTEM != bluetooth"
-	exit 1
-}
-
-. /etc/sysconfig/hardware/scripts/functions
-
+#!/bin/sh
 BLUETOOTH_CONFIG=/etc/sysconfig/bluetooth
-test -r $BLUETOOTH_CONFIG || exit 6
-. $BLUETOOTH_CONFIG
+test -r $BLUETOOTH_CONFIG && $BLUETOOTH_CONFIG
 
-case $ACTION in
+if [ "$START_BLUETOOTHD" = "no" ]; then
+	exit 0
+fi
 
-	add)
-		info_mesg $ACTION $INTERFACE  $START_SERVICES
-		if [ $START_SERVICES = "no" ]; then
-			exit 0
-		fi
-		# for later consumption by the bluetooth-coldplug init script
-		mkdir /dev/shm/bluetooth-adapter-present
-		# this is a fake dbus call, which gets the adapter up via DBus activation
-		/bin/dbus-send --system --type=method_call --print-reply --reply-timeout=1000 --dest=org.bluez / org.bluez.hello
-		;;
-
-	remove)
-		info_mesg $ACTION $INTERFACE
-		# Do this only if _all_ bt-devices are finally removed
-		# Problem: Devices in hid-proxy-mode are not known as /dev/hciX
-		if [ $ALWAYS_STOP_SERVICES = "yes" ]; then
-			/etc/init.d/bluetooth stop
-		fi
-    		;;
-
-	*)
-		info_mesg Bluetooth $ACTION event not supported
-		exit 1
-		;;
-esac
+exec /usr/sbin/bluetoothd --udev
diff --git a/bluetooth.sysconfig b/bluetooth.sysconfig
index b282720..958f914 100644
--- a/bluetooth.sysconfig
+++ b/bluetooth.sysconfig
@@ -1,129 +1,7 @@
 ############ general 
 ## Path:        Hardware/Bluetooth
-## Description: General settings for the Bluetooth device, if set to 'yes' bluetooth is started when hotplug reports 'added bluetooth device'
+## Description: General settings for the Bluetooth device, if set to 'yes' bluetooth is started when udev reports 'added bluetooth device'
 ## Type:        yesno
 ## Default:     yes
-## ServiceRestart: bluetooth
-
-START_SERVICES=yes
-
-############ HCID
-
-## Path:        Hardware/Bluetooth
-## Description: Start the daemon for managing Bluetooth devices
-## Type:        yesno
-## Default:     yes
-## ServiceRestart: bluetooth
-DAEMON_ENABLE=yes
-
-## Path:        Hardware/Bluetooth
-## Description: Set responsible daemon for managing Bluetooth devices
-## Type:        list("/usr/sbin/bluetoothd","")
-## Default:     "/usr/sbin/bluetoothd"
-## ServiceRestart: bluetooth
-DAEMON_EXEC="/usr/sbin/bluetoothd"
-
-## Path:        Hardware/Bluetooth
-## Description: Arguments for hci-demon
-## Type:	string("")
-## Default:     ""
-## ServiceRestart: bluetooth
-
-DAEMON_ARGS=""
-
-
-############ RFCOMM
-
-## Path:        Hardware/Bluetooth
-## Description: Start rfcomm service
-## Type:        yesno
-## Default:     no
-## ServiceRestart: bluetooth
-RFCOMM_ENABLE="yes"
-
-## Path:        Hardware/Bluetooth
-## Description: Set responsible service for rfcomm
-## Type:        list("/usr/bin/rfcomm","")
-## Default:     "/usr/bin/rfcomm"
-## ServiceRestart: bluetooth
-RFCOMM_EXEC="/usr/bin/rfcomm"
-
-## Path:        Hardware/Bluetooth
-## Description: Arguments for rfcomm service
-## Type:        list("-f /etc/bluetooth/rfcomm.conf bind all","")
-## Default:     "-f /etc/bluetooth/rfcomm.conf bind all"
-## ServiceRestart: bluetooth
-RFCOMM_ARGS="-f /etc/bluetooth/rfcomm.conf bind all"
-
-
-############ PAND
-
-## Path:        Hardware/Bluetooth
-## Description: Start daemon for Personal Area Network 
-## Type:        yesno
-## Default:     no
-## ServiceRestart: bluetooth
-PAND_ENABLE="no"
-
-## Path:        Hardware/Bluetooth
-## Description: Set responsible demon for Personal Area Network 
-## Type:        list("/usr/bin/pand","")
-## Default:     "/usr/bin/pand"
-## ServiceRestart: bluetooth
-PAND_EXEC="/usr/bin/pand"
-
-## Path:        Hardware/Bluetooth
-## Description: Arguments for pan-demon start
-## Type:        list("--listen --role NAP")
-## Default:     "--listen --role NAP"
-## ServiceRestart: bluetooth
-PAND_ARGS="--listen --role NAP"
-
-
-############ DUND
-
-## Path:        Hardware/Bluetooth
-## Description: Start responsible demon for LAN Access over PPP
-## Type:        yesno
-## Default:     no
-## ServiceRestart: bluetooth
-DUND_ENABLE="no"
-
-## Path:        Hardware/Bluetooth
-## Description: Set responsible demon for LAN Access over PPP
-## Type:        list("/usr/bin/dund","")
-## Default:     "/usr/bin/dund"
-## ServiceRestart: bluetooth
-DUND_EXEC="/usr/bin/dund"
-
-## Path:        Hardware/Bluetooth
-## Description: Arguments for dun-demon start
-## Type:        list("--listen --persist")
-## Default:     "--listen --persist"
-## ServiceRestart: bluetooth
-DUND_ARGS="--listen --persist"
-
-############ HID2HCI
-
-## Path:        Hardware/Bluetooth
-## Description: Start HID to HCI mode switching utility
-## Type:        yesno
-## Default:     yes
-## ServiceRestart: bluetooth
-HID2HCI_ENABLE="yes"
-
-## Path:        Hardware/Bluetooth
-## Description: Set responsible utility for HID to HCI mode switching 
-## Type:        list("/usr/bin/hidd","")
-## Default:     "/usr/sbin/hid2hci"
-## ServiceRestart: bluetooth
-HID2HCI_EXEC="/usr/sbin/hid2hci"
-
-## Path:        Hardware/Bluetooth
-## Description: Arguments for RHID to HCI mode switching utility
-## Type:        list("--tohci", "")
-## Default:     "--tohci"
-## ServiceRestart: bluetooth
-HID2HCI_ARGS="--tohci "
-
 
+START_BLUETOOTHD=yes
diff --git a/bluez-4.41-as_needed.patch b/bluez-4.41-as_needed.patch
deleted file mode 100644
index bf184d8..0000000
--- a/bluez-4.41-as_needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/Makefile.am
-+++ test/Makefile.am
-@@ -32,7 +32,7 @@
- 
- agent_LDADD = @DBUS_LIBS@
- 
--btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-+btiotest_LDADD = $(top_builddir)/common/libhelper.a @GLIB_LIBS@ @BLUEZ_LIBS@
- 
- noinst_MANS = bdaddr.8
- 
diff --git a/bluez-4.42.tar.bz2 b/bluez-4.42.tar.bz2
deleted file mode 100644
index 0f0b065..0000000
--- a/bluez-4.42.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aad63d07ba1ecc50c5b7ff9e298b24a3e29694f7df6350453acd79c2610a3e69
-size 823267
diff --git a/bluez-4.44-udev-use-helperscript.diff b/bluez-4.44-udev-use-helperscript.diff
new file mode 100644
index 0000000..ef008dc
--- /dev/null
+++ b/bluez-4.44-udev-use-helperscript.diff
@@ -0,0 +1,9 @@
+Index: b/scripts/bluetooth.rules
+===================================================================
+--- a/scripts/bluetooth.rules.in
++++ b/scripts/bluetooth.rules.in
+@@ -1,3 +1,3 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
diff --git a/bluez-4.45.tar.bz2 b/bluez-4.45.tar.bz2
new file mode 100644
index 0000000..f8d6319
--- /dev/null
+++ b/bluez-4.45.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90e6da70044745599393daa2401173b3caabcaf2e9960c0b5e0ab7e40b409009
+size 841494
diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes
index 9007653..76f3e5d 100644
--- a/bluez-gstreamer.changes
+++ b/bluez-gstreamer.changes
@@ -1,5 +1,46 @@
 -------------------------------------------------------------------
-Mon Jun 22 12:49:46 CEST 2009 - cmorve69@yahoo.es
+Thu Jul  9 11:08:28 CEST 2009 - seife@suse.de
+
+- packaging: remove unused bluetooth.rules file (thanks darix!)
+
+-------------------------------------------------------------------
+Wed Jul  8 00:00:30 CEST 2009 - seife@suse.de
+
+- update to bluez-4.45:
+  - Fix UDEV_DATADIR fallback if pkg-config fails.
+  - Fix adapter cleanup and setup prototypes.
+  - Fix double-free with out-of-range devices.
+  - Fix inband ring setting to be per-headset.
+  - Fix handling of Maemo CSD startup.
+
+-------------------------------------------------------------------
+Tue Jul  7 10:24:05 CEST 2009 - seife@suse.de
+
+- update to bluez-4.44:
+  - Add some missing manual pages.
+  - Fix three-way calling indicator order.
+  - Fix downgrade/upgrade of callheld indicator.
+  - Fix +CIEV sending when indicator value changes.
+  - Fix signal handling for Maemo telephony driver.
+  - Fix parsing issues with messages from Maemo CSD.
+  - Fix issue with duplicate active calls.
+- udev rules moved to /lib/udev/rules.d
+
+-------------------------------------------------------------------
+Fri Jul  3 23:27:46 CEST 2009 - seife@suse.de
+
+- update to bluez-4.43:
+  - Add support for udev based on-demand startup.
+  - Fix verbose error reporting of CUPS backend.
+  - Fix various string length issues.
+  - Fix issues with Maemo telephony driver.
+  - Fix another device setup and temporary flag issue.
+  - Fix and update example agent implementation.
+- remove init scripts and D-Bus activation, instead bluetoothd is
+  now started by udev. Update README.SUSE accordingly.
+
+-------------------------------------------------------------------
+Mon Jun 22 12:49:35 CEST 2009 - cmorve69@yahoo.es
 
 - fixed build with --as-needed
 
diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec
index d4266b6..cdfa4d3 100644
--- a/bluez-gstreamer.spec
+++ b/bluez-gstreamer.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bluez-gstreamer (Version 4.42)
+# spec file for package bluez-gstreamer (Version 4.45)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,10 +21,10 @@
 Name:           bluez-gstreamer
 BuildRequires:  dbus-1-devel flex
 BuildRequires:  glib2-devel libnl-devel libusb-devel
-BuildRequires:  alsa-devel libsndfile-devel
+BuildRequires:  alsa-devel libsndfile-devel pkg-config udev
 BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
 Url:            http://www.bluez.org
-Version:        4.42
+Version:        4.45
 Release:        1
 Summary:        Bluetooth Sound Support
 Group:          Productivity/Multimedia/Sound/Utilities
@@ -32,17 +32,18 @@ License:        GPL v2 or later
 Group:          Productivity/Multimedia/Sound/Utilities
 AutoReqProv:    on
 Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2
-Source1:        bluetooth.init
-Source2:        bluetooth-coldplug.init
 Source3:        bluetooth.sysconfig
 Source4:        bluetooth.sh
-Source5:        org.bluez.service
 Source6:        README.SUSE
-Source7:        bluetooth.rules
-Patch:          bluez-4.41-as_needed.patch
+Patch1:         bluez-4.44-udev-use-helperscript.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       libbluetooth3 = %{version}
 Provides:       bluez-audio:%_libdir/gstreamer-0.10/libgstbluetooth.so
+%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.
@@ -58,20 +59,12 @@ Authors:
 
 %prep
 %setup -n bluez-%{version} -q
-%patch
-cp %{S:1} scripts/
+%patch1 -p1
 cp %{S:6} .
-cp %{S:7} scripts
 %{?suse_update_config:%{suse_update_config -f . }}
 
 %build
-autoreconf -sfi
-#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --libdir=%_libdir --localstatedir=%_localstatedir
-#make
-#%build
-#cd ../bluez-utils-%{version}
 # autoreconf -sfi
-# CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g" \
 CFLAGS="$RPM_OPT_FLAGS -g" \
 	./configure	--prefix=%{_prefix} \
 			--mandir=%{_mandir} \
@@ -93,8 +86,7 @@ CFLAGS="$RPM_OPT_FLAGS -g" \
 			--enable-dund		\
 			--enable-manpages	\
 			--enable-configfiles	\
-			--enable-initscripts	\
-			--enable-pcmciarules
+			--enable-pcmcia
 make %{?jobs:-j %jobs} all
 
 %install
diff --git a/bluez.changes b/bluez.changes
index ca893f2..76f3e5d 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Jul  9 11:08:28 CEST 2009 - seife@suse.de
+
+- packaging: remove unused bluetooth.rules file (thanks darix!)
+
+-------------------------------------------------------------------
+Wed Jul  8 00:00:30 CEST 2009 - seife@suse.de
+
+- update to bluez-4.45:
+  - Fix UDEV_DATADIR fallback if pkg-config fails.
+  - Fix adapter cleanup and setup prototypes.
+  - Fix double-free with out-of-range devices.
+  - Fix inband ring setting to be per-headset.
+  - Fix handling of Maemo CSD startup.
+
+-------------------------------------------------------------------
+Tue Jul  7 10:24:05 CEST 2009 - seife@suse.de
+
+- update to bluez-4.44:
+  - Add some missing manual pages.
+  - Fix three-way calling indicator order.
+  - Fix downgrade/upgrade of callheld indicator.
+  - Fix +CIEV sending when indicator value changes.
+  - Fix signal handling for Maemo telephony driver.
+  - Fix parsing issues with messages from Maemo CSD.
+  - Fix issue with duplicate active calls.
+- udev rules moved to /lib/udev/rules.d
+
+-------------------------------------------------------------------
+Fri Jul  3 23:27:46 CEST 2009 - seife@suse.de
+
+- update to bluez-4.43:
+  - Add support for udev based on-demand startup.
+  - Fix verbose error reporting of CUPS backend.
+  - Fix various string length issues.
+  - Fix issues with Maemo telephony driver.
+  - Fix another device setup and temporary flag issue.
+  - Fix and update example agent implementation.
+- remove init scripts and D-Bus activation, instead bluetoothd is
+  now started by udev. Update README.SUSE accordingly.
+
 -------------------------------------------------------------------
 Mon Jun 22 12:49:35 CEST 2009 - cmorve69@yahoo.es
 
diff --git a/bluez.spec b/bluez.spec
index c5994f5..6f81fa6 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bluez (Version 4.42)
+# spec file for package bluez (Version 4.45)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,9 +21,9 @@
 Name:           bluez
 BuildRequires:  dbus-1-devel flex
 BuildRequires:  glib2-devel libnl-devel libusb-devel
-BuildRequires:  alsa-devel libsndfile-devel
+BuildRequires:  alsa-devel libsndfile-devel pkg-config udev
 Url:            http://www.bluez.org
-Version:        4.42
+Version:        4.45
 Release:        1
 Summary:        Bluetooth Stack for Linux
 Group:          Hardware/Mobile
@@ -31,21 +31,22 @@ License:        GPL v2 or later
 Group:          Hardware/Mobile
 AutoReqProv:    on
 Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.bz2
-Source1:        bluetooth.init
-Source2:        bluetooth-coldplug.init
 Source3:        bluetooth.sysconfig
 Source4:        bluetooth.sh
-Source5:        org.bluez.service
 Source6:        README.SUSE
 Source7:        bluetooth.modprobe
-Source8:        bluetooth.rules
-Patch:          bluez-4.41-as_needed.patch
+Patch1:         bluez-4.44-udev-use-helperscript.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       bluez-utils = 3.36
 Obsoletes:      bluez-utils <= 3.36
 Provides:       bluez-audio = 3.36
 Obsoletes:      bluez-audio <= 3.36
 Requires:       libbluetooth3 = %{version}
+%if %( echo `rpm -q --queryformat %%{version} udev` ) < 144
+%define OLD_UDEV 1
+%else
+%define OLD_UDEV 0
+%endif
 
 %description
 The Bluetooth stack for Linux.
@@ -163,21 +164,14 @@ Authors:
 
 %prep
 %setup -q
-%patch
-cp %{S:1} scripts/
+%patch1 -p1
 cp %{S:6} .
 %{?suse_update_config:%{suse_update_config -f . }}
 mkdir dbus-apis
 cp -a doc/*.txt dbus-apis/
 
 %build
-autoreconf -sfi
-#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --libdir=%_libdir --localstatedir=%_localstatedir
-#make
-#%build
-#cd ../bluez-utils-%{version}
 # autoreconf -sfi
-# CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g" \
 CFLAGS="$RPM_OPT_FLAGS -g" \
 	./configure	--prefix=%{_prefix} \
 			--mandir=%{_mandir} \
@@ -199,8 +193,7 @@ CFLAGS="$RPM_OPT_FLAGS -g" \
 			--enable-dund		\
 			--enable-manpages	\
 			--enable-configfiles	\
-			--enable-initscripts	\
-			--enable-pcmciarules
+			--enable-pcmcia
 make %{?jobs:-j %jobs} all
 
 %install
@@ -225,23 +218,15 @@ cd ..
 rm -v $RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la $RPM_BUILD_ROOT/%{_libdir}/libbluetooth.la
 rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-*
 rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la
-install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluetooth-coldplug
 install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth
 install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
-install --mode=0644 -D %{S:5} $RPM_BUILD_ROOT/usr/share/dbus-1/system-services/org.bluez.service
 install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
-install --mode=0644 -D %{S:8} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/40-bluetooth.rules
-#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d
-mv -v $RPM_BUILD_ROOT/etc/udev/bluetooth-hid2hci.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/41-bluetooth-hid2hci.rules
-mv -v $RPM_BUILD_ROOT/etc/udev/bluetooth-serial.rules  $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/42-bluetooth-serial.rules
-ln -s ../../etc/init.d/bluetooth $RPM_BUILD_ROOT/usr/sbin/rcbluetooth
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %{fillup_only -n bluetooth}
-/sbin/insserv -f /etc/init.d/bluetooth-coldplug
 
 %preun
 %stop_on_removal bluetooth
@@ -256,8 +241,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog README README.SUSE dbus-apis
-/etc/init.d/bluetooth
-/etc/init.d/bluetooth-coldplug
 %{_bindir}/hcitool
 %{_bindir}/l2ping
 %{_bindir}/rfcomm
@@ -268,11 +251,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/hciconfig
 %{_sbindir}/bluetoothd
 %{_sbindir}/hid2hci
-%{_sbindir}/rcbluetooth
 %{_sbindir}/bccmd
-%dir %{_sysconfdir}/udev
 %dir /lib/udev
 /lib/udev/*
+%if 0%{OLD_UDEV}
+%dir %{_sysconfdir}/udev/rules.d
+%config %{_sysconfdir}/udev/rules.d/*
+%endif
 %dir %{_libdir}/bluetooth
 %dir %{_libdir}/bluetooth/plugins
 %{_libdir}/bluetooth/plugins/audio.so
@@ -286,20 +271,19 @@ rm -rf $RPM_BUILD_ROOT
 %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/hcitool.1.gz
 %doc %{_mandir}/man1/sdptool.1.gz
 %doc %{_mandir}/man1/ciptool.1.gz
 %doc %{_mandir}/man1/rfcomm.1.gz
-%doc %{_mandir}/man1/l2ping.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
-%config %{_sysconfdir}/default/bluetooth
 /var/adm/fillup-templates/sysconfig.bluetooth
-%config %{_sysconfdir}/udev/rules.d
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
-%config /usr/share/dbus-1/system-services/org.bluez.service
 #%doc %{_defaultdocdir}/bluez-utils/
 %dir /var/lib/bluetooth
 %dir %{_sysconfdir}/modprobe.d
diff --git a/org.bluez.service b/org.bluez.service
deleted file mode 100644
index 3d5188b..0000000
--- a/org.bluez.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez
-Exec=/etc/init.d/bluetooth start
-User=root