rpms/bluez-utils/devel org.bluez.service, NONE, 1.1 bluetooth.init, 1.9, 1.10 bluez-utils.spec, 1.100, 1.101 dund.init, 1.7, 1.8 pand.init, 1.7, 1.8

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2182

Modified Files:
	bluetooth.init bluez-utils.spec dund.init pand.init 
Added Files:
	org.bluez.service 
Log Message:
* Wed May 21 2008 - Bastien Nocera <bnocera at redhat.com> - 3.31-2
- Add a .service file, starting up hcid only when used (#446918)
- Fix descriptions in the initscript headers (#433647)



--- NEW FILE org.bluez.service ---
[D-BUS Service]
Name=org.bluez
Exec=/usr/sbin/hcid
User=root


Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluetooth.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bluetooth.init	5 Oct 2007 12:20:18 -0000	1.9
+++ bluetooth.init	21 May 2008 00:17:50 -0000	1.10
@@ -2,10 +2,9 @@
 
 ### BEGIN INIT INFO
 # Required-Start: $syslog messagebus
-# Default-Start: 2 3 4 5
 # Short-Description: Bluetooth services
 # Description: Bluetooth services for service discovery, authentication, 
-# Human Interface Devices, etc.
+#  Human Interface Devices, etc.
 ### END INIT INFO
 
 # Source function library.
@@ -31,9 +30,6 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
-	daemon /usr/sbin/hcid -s
-	RETVAL=$?
-	[ $RETVAL = 0 ] && touch /var/lock/subsys/hcid
 	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
 	start_uarts
 	rfcomm bind all
@@ -48,9 +44,6 @@
 	stop_uarts
 	rfcomm release all
 	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
-	killproc hcid
-	RETVAL=$?
-	rm -f /var/lock/subsys/hcid
 	rm -f /var/lock/subsys/bluetooth
 	echo ""
 	return $RETVAL


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- bluez-utils.spec	6 May 2008 09:56:33 -0000	1.100
+++ bluez-utils.spec	21 May 2008 00:17:50 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 3.31
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Source6: pand.conf
 Source7: dund.conf
 Source9: bluetooth.conf
+Source10: org.bluez.service
 Patch0: bluez-utils-2.3-conf.patch
 Patch1: bluez-utils-oui-usage.patch
 # http://thread.gmane.org/gmane.linux.bluez.devel/15604
@@ -106,6 +107,9 @@
 install -m0644 audio/audio.conf $RPM_BUILD_ROOT/%{_sysconfdir}/bluetooth/audio.conf
 install -m0644 network/network.conf $RPM_BUILD_ROOT/%{_sysconfdir}/bluetooth/network.conf
 
+mkdir -p -m0755 $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services/
+install -m0644 %{SOURCE10} $RPM_BUILD_ROOT/%{_datadir}/dbus-1/system-services/
+
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*/*.la
 
 %clean
@@ -142,6 +146,7 @@
 %{_sbindir}/*
 %{_mandir}/man*/*
 %{_libdir}/bluetooth
+%{_datadir}/dbus-1/system-services/org.bluez.service
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
@@ -163,6 +168,10 @@
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Wed May 21 2008 - Bastien Nocera <bnocera at redhat.com> - 3.31-2
+- Add a .service file, starting up hcid only when used (#446918)
+- Fix descriptions in the initscript headers (#433647)
+
 * Tue May 06 2008 - Bastien Nocera <bnocera at redhat.com> - 3.31-1
 - Update to 3.31
 


Index: dund.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/dund.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dund.init	31 Jan 2008 11:18:18 -0000	1.7
+++ dund.init	21 May 2008 00:17:50 -0000	1.8
@@ -7,7 +7,7 @@
 # Default-Start: 
 # Short-Description: Bluetooth Dial-Up-Networking Daemon.
 # Description: Bluetooth Dial-Up-Networking Daemon. Provides PPP over RFCOMM
-# services.
+#  services.
 ### END INIT INFO
 
 # Source function library.


Index: pand.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-utils/devel/pand.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pand.init	31 Jan 2008 11:18:18 -0000	1.7
+++ pand.init	21 May 2008 00:17:50 -0000	1.8
@@ -7,7 +7,7 @@
 # Default-Start:
 # Short-Description: Bluetooth Personal Area Networking Daemon.
 # Description: Bluetooth Personal Area Networking Daemon. Provides network
-# services over Bluetooth.
+#  services over Bluetooth.
 ### END INIT INFO
 
 # Source function library.