rpms/bluez/devel bluetooth.init, 1.4, 1.5 bluez.spec, 1.85, 1.86 bluetooth.conf, 1.3, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3748

Modified Files:
	bluetooth.init bluez.spec 
Removed Files:
	bluetooth.conf 
Log Message:
* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 4.47-2
- Remove hid2hci calls, they're in udev now
- Work-around udev bug, bluetoothd wasn't getting enabled
  on coldplug



Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluetooth.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- bluetooth.init	12 Jun 2009 17:40:17 -0000	1.4
+++ bluetooth.init	5 Aug 2009 10:08:53 -0000	1.5
@@ -4,8 +4,8 @@
 # description: Turn HID adapters into Bluetooth ones
 #
 ### BEGIN INIT INFO
-# Short-Description: Turn HID adapters into Bluetooth ones
-# Description: Turn HID adapters into Bluetooth ones
+# Short-Description: Trigger bluetoothd start-up
+# Description: Trigger bluetoothd start-up
 ### END INIT INFO
 
 # Source function library.
@@ -15,21 +15,18 @@
 
 start()
 {
-	echo -n $"Starting hid2hci:"
-	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
-	RETVAL=$?
-	touch /var/lock/subsys/bluetooth
+	echo -n $"Enabling Bluetooth devices:"
+	udevadm trigger --subsystem-match=bluetooth
 	echo ""
-	return $RETVAL
+	return 0
 }
 
 stop()
 {
+	# FIXME If somebody figures out how to disable the K* script
 	echo -n "Stopping Bluetooth services:"
-	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
-	RETVAL=$?
 	echo ""
-	return $RETVAL
+	return 0
 }
 
 case "$1" in
@@ -39,11 +36,8 @@ case "$1" in
   stop)
 	stop
 	;;
-  status)
-	RETVAL=0
-	;;
   *)
-	echo $"Usage: $0 {start|stop|status}"
+	echo $"Usage: $0 {start|stop}"
 	exit 3
 	;;
 esac


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- bluez.spec	2 Aug 2009 00:44:12 -0000	1.85
+++ bluez.spec	5 Aug 2009 10:08:53 -0000	1.86
@@ -1,12 +1,11 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.47
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
-Source2: bluetooth.conf
 Source3: dund.init
 Source4: dund.conf
 Source5: pand.init
@@ -134,7 +133,7 @@ This includes hidd, dund and pand.
 %build
 libtoolize -f -c
 autoreconf
-%configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
+%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
 make
 
 %install
@@ -223,7 +222,6 @@ fi
 %{_mandir}/man8/*
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
-%config(noreplace) %{_sysconfdir}/sysconfig/bluetooth
 %config(noreplace) %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %{_libdir}/bluetooth/
@@ -270,6 +268,11 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Wed Aug 05 2009 Bastien Nocera <bnocera at redhat.com> 4.47-2
+- Remove hid2hci calls, they're in udev now
+- Work-around udev bug, bluetoothd wasn't getting enabled
+  on coldplug
+
 * Sun Aug 02 2009 Bastien Nocera <bnocera at redhat.com> 4.47-1
 - Update to 4.47
 


--- bluetooth.conf DELETED ---