From 6e0c17e8818a8f56489c43c7bf3fd909d4300f9b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Aug 03 2009 10:26:35 +0000
Subject: - Let udev rules handle hid2hci (#514698)


---

diff --git a/bluetooth.conf b/bluetooth.conf
deleted file mode 100644
index 0d6c5fe..0000000
--- a/bluetooth.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Enable this to use hid2hci to switch a Bluetooth device in USB HID mode
-# to HCI mode for Bluetooth operation.
-#HID2HCI_ENABLE=true
-
-# Enable this to switch capable devices back to HID mode on Bluetooth shutdown
-#HID2HCI_UNDO=true
diff --git a/bluetooth.init b/bluetooth.init
index ed7845a..b548a1c 100644
--- a/bluetooth.init
+++ b/bluetooth.init
@@ -22,7 +22,6 @@ start()
 	daemon /usr/sbin/bluetoothd
 	RETVAL=$?
 	[ $RETVAL = 0 ] && touch /var/lock/subsys/bluetoothd
-	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
 	touch /var/lock/subsys/bluetooth
 	echo ""
 	return $RETVAL
@@ -31,7 +30,6 @@ start()
 stop()
 {
 	echo -n "Stopping Bluetooth services:"
-	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
 	killproc bluetoothd
 	RETVAL=$?
 	rm -f /var/lock/subsys/bluetooth
diff --git a/bluez.spec b/bluez.spec
index f86c5ee..eca2a2d 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,13 +1,12 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.42
-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: bluez-uinput.modules
+Source2: bluez-uinput.modules
 Patch1: bluez-utils-oui-usage.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=450081
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
@@ -124,7 +123,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la				\
 	$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
 
 install -D -m0755 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bluetooth
-install -D -m0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bluetooth
 
 # Remove the cups backend from libdir, and install it in /usr/lib whatever the install
 if test -d ${RPM_BUILD_ROOT}/usr/lib64/cups ; then
@@ -132,12 +130,10 @@ if test -d ${RPM_BUILD_ROOT}/usr/lib64/cups ; then
 	rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups
 fi
 
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/udev/bluetooth-hid2hci.rules
-
 install -D -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
 install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial
 
-install -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
+install -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
 install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth
 
@@ -169,13 +165,14 @@ fi
 %{_mandir}/man8/*
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %{_libdir}/bluetooth/
 /lib/udev/bluetooth_serial
 %{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
+%{_sysconfdir}/udev/bluetooth-hid2hci.rules
 /etc/rc.d/init.d/*
 %{_localstatedir}/lib/bluetooth
+%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
 %files libs
 %defattr(-, root, root)
@@ -203,6 +200,9 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Mon Aug 03 2009 Bastien Nocera <bnocera@redhat.com> 4.42-2
+- Let udev rules handle hid2hci (#514698)
+
 * Wed Jun 24 2009 Bastien Nocera <bnocera@redhat.com> 4.42-1
 - Update to 4.42