rpms/bluez/devel .cvsignore, 1.2, 1.3 bluetooth.init, 1.1, 1.2 bluez.spec, 1.1, 1.2 sources, 1.2, 1.3 bluez-4.4-input.patch, 1.1, NONE import.log, 1.1, NONE

[Bastien Nocera]

Author: hadess

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

Modified Files:
	.cvsignore bluetooth.init bluez.spec sources 
Removed Files:
	bluez-4.4-input.patch import.log 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 4.5-1
- Update to 4.5
- Fix initscript to actually start bluetoothd by hand
- Add chkconfig information to the initscript



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Sep 2008 02:10:23 -0000	1.2
+++ .cvsignore	12 Sep 2008 09:34:04 -0000	1.3
@@ -1 +1 @@
-bluez-4.4.tar.gz
+bluez-4.5.tar.gz


Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluetooth.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluetooth.init	11 Sep 2008 02:10:23 -0000	1.1
+++ bluetooth.init	12 Sep 2008 09:34:05 -0000	1.2
@@ -1,5 +1,9 @@
 #!/bin/sh
-
+#
+# chkconfig: 345 50 83
+# description: Bluetooth services for service discovery, authentication, \
+#	       Human Interface Devices, etc.
+#
 ### BEGIN INIT INFO
 # Required-Start: $syslog messagebus
 # Short-Description: Bluetooth services
@@ -15,6 +19,9 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
+	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 ""
@@ -25,7 +32,10 @@
 {
 	echo -n "Stopping Bluetooth services:"
 	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
+	killproc bluetoothd
+	RETVAL=$?
 	rm -f /var/lock/subsys/bluetooth
+	rm -f /var/lock/subsys/bluetoothd
 	echo ""
 	return $RETVAL
 }
@@ -45,7 +55,7 @@
         [ -e /var/lock/subsys/bluetooth ] && (stop; start)
         ;;
   status)
-        status hcid
+        status bluetoothd
 	RETVAL=$?
         ;;
   *)


Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/bluez.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluez.spec	11 Sep 2008 02:10:24 -0000	1.1
+++ bluez.spec	12 Sep 2008 09:34:05 -0000	1.2
@@ -1,14 +1,13 @@
 Summary: Bluetooth libraries and utilities
 Name: bluez
-Version: 4.4
-Release: 2%{?dist}
+Version: 4.5
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
-Patch2: bluez-4.4-input.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -94,7 +93,6 @@
 
 %setup -q
 %patch1 -p0 -b .oui
-%patch2 -p1 -b .input
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -189,6 +187,11 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 4.5-1
+- Update to 4.5
+- Fix initscript to actually start bluetoothd by hand
+- Add chkconfig information to the initscript
+
 * Tue Sep 09 2008 - David Woodhouse <David.Woodhouse at intel.com> - 4.4-2
 - Fix rpmlint problems
 - Fix input device handling


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Sep 2008 02:10:24 -0000	1.2
+++ sources	12 Sep 2008 09:34:05 -0000	1.3
@@ -1 +1 @@
-0fd526ecea7fa7fb53298e8f335526c6  bluez-4.4.tar.gz
+97d4dfad90ed924952d013bd0b03bedd  bluez-4.5.tar.gz


--- bluez-4.4-input.patch DELETED ---


--- import.log DELETED ---