Accepting request 127750 from home:seife:testing

remove unused bluetooth.sh, bluez-4.75-udev-use-helperscript.diff

OBS-URL: https://build.opensuse.org/request/show/127750
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=122
This commit is contained in:
Stefan Seyfried 2012-07-12 14:45:28 +00:00 committed by Git OBS Bridge
parent 26ac33748c
commit 65ad51609d
6 changed files with 10 additions and 23 deletions

View File

@ -1,9 +0,0 @@
#!/bin/sh
BLUETOOTH_CONFIG=/etc/sysconfig/bluetooth
test -r $BLUETOOTH_CONFIG && . $BLUETOOTH_CONFIG
if [ "$START_BLUETOOTHD" = "no" ]; then
exit 0
fi
exec /usr/sbin/bluetoothd --udev

View File

@ -1,11 +0,0 @@
Index: b/scripts/bluetooth.rules.in
===================================================================
--- a/scripts/bluetooth.rules.in
+++ b/scripts/bluetooth.rules.in
@@ -1,4 +1,4 @@
# Run helper every time a Bluetooth device appears
# On remove actions, bluetoothd should go away by itself
-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
-ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
+ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
+ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 11 14:04:54 UTC 2012 - seife+obs@b1-systems.com
- remove unused bluetooth.sh, bluez-4.75-udev-use-helperscript.diff
-------------------------------------------------------------------
Wed Jun 27 20:39:52 UTC 2012 - seife+obs@b1-systems.com

View File

@ -46,7 +46,6 @@ License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Utilities
Source: bluez-%{version}.tar.bz2
Source3: bluetooth.sysconfig
Source4: bluetooth.sh
Source6: README.SUSE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libbluetooth3 = %{version}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 11 14:04:54 UTC 2012 - seife+obs@b1-systems.com
- remove unused bluetooth.sh, bluez-4.75-udev-use-helperscript.diff
-------------------------------------------------------------------
Wed Jun 27 20:39:52 UTC 2012 - seife+obs@b1-systems.com

View File

@ -49,7 +49,6 @@ Source: bluez-%{version}.tar.bz2
Source1: org.bluez.service
Source2: bluez-coldplug.init
Source3: bluetooth.sysconfig
Source4: bluetooth.sh
Source5: baselibs.conf
Source6: README.SUSE
Source7: bluetooth.modprobe
@ -290,7 +289,6 @@ rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-*
rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la
install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluez-coldplug
install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth
install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
# In openSUSE 11.3 there is upstream compliant CUPS 1.4
# which means to have a fixed "/usr/lib/cups/" directory