From b82bd705f6c0f9a954a69b7e1a56012c091bfb18c4c3085df04ee62570768936 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 21 Jan 2013 10:30:56 +0000 Subject: [PATCH] Accepting request 149365 from home:seife:testing remove unused source files, align bluez-gstreamer changelog with bluez changelog OBS-URL: https://build.opensuse.org/request/show/149365 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=133 --- 001-remove-rule-dell-mouse.patch | 11 --------- bluez-gstreamer.changes | 38 ++++++++++++++++++++++++++++++++ bluez.changes | 20 +++++++++++++++++ bluez.spec | 8 +------ org.bluez.service | 5 ----- 5 files changed, 59 insertions(+), 23 deletions(-) delete mode 100644 001-remove-rule-dell-mouse.patch delete mode 100644 org.bluez.service diff --git a/001-remove-rule-dell-mouse.patch b/001-remove-rule-dell-mouse.patch deleted file mode 100644 index 8d0fe43..0000000 --- a/001-remove-rule-dell-mouse.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scripts/bluetooth-hid2hci.rules 2009-10-16 20:29:22.000000000 +0200 -+++ b/scripts/bluetooth-hid2hci.rules 2009-10-16 20:28:35.000000000 +0200 -@@ -8,7 +8,7 @@ - # 413c:8154 - # 413c:8158 - # 413c:8162 --ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" -+# ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" - - # Logitech devices - ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c703" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes index 5ee229c..e6c2695 100644 --- a/bluez-gstreamer.changes +++ b/bluez-gstreamer.changes @@ -1,8 +1,46 @@ +------------------------------------------------------------------- +Fri Jan 11 14:38:03 UTC 2013 - crrodriguez@opensuse.org + +- Add changelog entry for older change so factory-auto wont reject this. +- This requests removes sbc building and packaging from bluez. +SBC recently gets its own package and sources are even stripped out ot +Bluez in current git master (future 5.0). +On top of that current bluez-devel package conflicts with sbc-devel. +Note: This change may broke packages which use sbc from bluez-devel +as new sbc-devel package use different include path. +This change is required to properly build PulseAudio 3.0 + +------------------------------------------------------------------- +Wed Oct 31 14:50:01 UTC 2012 - crrodriguez@opensuse.org + +- bluez-coldplug init script is forced but it s not needed + when using systemd with dbus activation. + +------------------------------------------------------------------- +Wed Oct 17 11:44:49 UTC 2012 - seife+obs@b1-systems.com + +- remove unused 001-remove-rule-dell-mouse.patch + ------------------------------------------------------------------- Wed Oct 17 09:18:47 UTC 2012 - fcrozat@suse.com - Fix build with new systemd / udev location. +------------------------------------------------------------------- +Wed Oct 17 08:52:03 UTC 2012 - fcrozat@suse.com + +- Change udev rules location with udev > 190 + +------------------------------------------------------------------- +Tue Aug 28 09:37:12 UTC 2012 - seife+obs@b1-systems.com + +- enable bluetooth.service on install (bnc#772455) + +------------------------------------------------------------------- +Sat Jul 28 13:00:59 UTC 2012 - seife+obs@b1-systems.com + +- remove unused service file (now in upstream tarball) + ------------------------------------------------------------------- Fri Jul 20 14:58:35 UTC 2012 - seife+obs@b1-systems.com diff --git a/bluez.changes b/bluez.changes index b4182ce..e6c2695 100644 --- a/bluez.changes +++ b/bluez.changes @@ -16,11 +16,31 @@ Wed Oct 31 14:50:01 UTC 2012 - crrodriguez@opensuse.org - bluez-coldplug init script is forced but it s not needed when using systemd with dbus activation. +------------------------------------------------------------------- +Wed Oct 17 11:44:49 UTC 2012 - seife+obs@b1-systems.com + +- remove unused 001-remove-rule-dell-mouse.patch + +------------------------------------------------------------------- +Wed Oct 17 09:18:47 UTC 2012 - fcrozat@suse.com + +- Fix build with new systemd / udev location. + ------------------------------------------------------------------- Wed Oct 17 08:52:03 UTC 2012 - fcrozat@suse.com - Change udev rules location with udev > 190 +------------------------------------------------------------------- +Tue Aug 28 09:37:12 UTC 2012 - seife+obs@b1-systems.com + +- enable bluetooth.service on install (bnc#772455) + +------------------------------------------------------------------- +Sat Jul 28 13:00:59 UTC 2012 - seife+obs@b1-systems.com + +- remove unused service file (now in upstream tarball) + ------------------------------------------------------------------- Fri Jul 20 14:58:35 UTC 2012 - seife+obs@b1-systems.com diff --git a/bluez.spec b/bluez.spec index 13064ac..094b028 100644 --- a/bluez.spec +++ b/bluez.spec @@ -45,8 +45,6 @@ Summary: Bluetooth Stack for Linux License: GPL-2.0+ Group: Hardware/Mobile Source: bluez-%{version}.tar.bz2 -# bug in the 4.100 tarball: missing file... -Source1: org.bluez.service Source2: bluez-coldplug.init Source3: bluetooth.sysconfig Source5: baselibs.conf @@ -54,8 +52,6 @@ Source6: README.SUSE Source7: bluetooth.modprobe # already fixed upstream Patch0: 0001-network-fix-network-Connect-method-parameters.patch -# TODO: check for obsoletion -Patch9: 001-remove-rule-dell-mouse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: bluez-utils = 3.36 Obsoletes: bluez-utils <= 3.36 @@ -202,9 +198,6 @@ Authors: %prep %setup -q %patch0 -p1 -# disabled the patch because it does no longer cleanly apply and the rule has -# changed significantly anyway. I'll keep it until i get confirmation in bugzilla. -##%%patch9 -p1 cp %{S:6} . mkdir dbus-apis cp -a doc/*.txt dbus-apis/ @@ -285,6 +278,7 @@ rm -rf $RPM_BUILD_ROOT %endif %post +# todo: check if this is still obeyed / needed with systemd %{fillup_only -n bluetooth} %if 0%{?has_systemd} %service_add_post bluetooth.service diff --git a/org.bluez.service b/org.bluez.service deleted file mode 100644 index 5b65b0a..0000000 --- a/org.bluez.service +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=org.bluez -Exec=/bin/false -User=root -SystemdService=dbus-org.bluez.service