rpms/bluez/F-11 bluetooth.init, 1.2, 1.3 bluez.spec, 1.66, 1.67 bluetooth.conf, 1.1, NONE
Bastien Nocera
hadess at fedoraproject.org
Mon Aug 3 10:26:35 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/bluez/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27389
Modified Files:
bluetooth.init bluez.spec
Removed Files:
bluetooth.conf
Log Message:
* Mon Aug 03 2009 Bastien Nocera <bnocera at redhat.com> 4.42-2
- Let udev rules handle hid2hci (#514698)
Index: bluetooth.init
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluetooth.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bluetooth.init 12 Sep 2008 09:34:05 -0000 1.2
+++ bluetooth.init 3 Aug 2009 10:26:35 -0000 1.3
@@ -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
Index: bluez.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-11/bluez.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- bluez.spec 25 Jun 2009 16:55:17 -0000 1.66
+++ bluez.spec 3 Aug 2009 10:26:35 -0000 1.67
@@ -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/c
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 at redhat.com> 4.42-2
+- Let udev rules handle hid2hci (#514698)
+
* Wed Jun 24 2009 Bastien Nocera <bnocera at redhat.com> 4.42-1
- Update to 4.42
--- bluetooth.conf DELETED ---
More information about the fedora-extras-commits
mailing list