From 65ad51609d05114f940e1615ca6aad812b449236d536d09df6ed2dc3e99e963e Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 12 Jul 2012 14:45:28 +0000 Subject: [PATCH] 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 --- bluetooth.sh | 9 --------- bluez-4.75-udev-use-helperscript.diff | 11 ----------- bluez-gstreamer.changes | 5 +++++ bluez-gstreamer.spec | 1 - bluez.changes | 5 +++++ bluez.spec | 2 -- 6 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 bluetooth.sh delete mode 100644 bluez-4.75-udev-use-helperscript.diff diff --git a/bluetooth.sh b/bluetooth.sh deleted file mode 100644 index 4c1c8e5..0000000 --- a/bluetooth.sh +++ /dev/null @@ -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 diff --git a/bluez-4.75-udev-use-helperscript.diff b/bluez-4.75-udev-use-helperscript.diff deleted file mode 100644 index 352ce8a..0000000 --- a/bluez-4.75-udev-use-helperscript.diff +++ /dev/null @@ -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" diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes index e0cb9d2..25429ae 100644 --- a/bluez-gstreamer.changes +++ b/bluez-gstreamer.changes @@ -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 diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec index ffe8531..bd08790 100644 --- a/bluez-gstreamer.spec +++ b/bluez-gstreamer.spec @@ -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} diff --git a/bluez.changes b/bluez.changes index e0cb9d2..25429ae 100644 --- a/bluez.changes +++ b/bluez.changes @@ -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 diff --git a/bluez.spec b/bluez.spec index 46744cc..3d29774 100644 --- a/bluez.spec +++ b/bluez.spec @@ -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