mirror of
https://abf.rosa.ru/djam/bluez.git
synced 2025-02-22 22:52:55 +00:00
Revert version 5.48
This commit is contained in:
VictorR2007
parent
a6d8506e4e
commit
f71eb6c143
3 changed files with 53 additions and 50 deletions
|
|
@ -9,11 +9,11 @@ relative paths aren't used by the agent.
|
|||
obexd/src/manager.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: bluez/obexd/src/manager.c
|
||||
===================================================================
|
||||
--- bluez.orig/obexd/src/manager.c
|
||||
+++ bluez/obexd/src/manager.c
|
||||
@@ -653,14 +653,14 @@ static void agent_reply(DBusPendingCall
|
||||
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
|
||||
index cec8a39..f18896e 100644
|
||||
--- a/obexd/src/manager.c
|
||||
+++ b/obexd/src/manager.c
|
||||
@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
|
||||
DBUS_TYPE_STRING, &name,
|
||||
DBUS_TYPE_INVALID)) {
|
||||
/* Splits folder and name */
|
||||
|
|
@ -33,3 +33,6 @@ Index: bluez/obexd/src/manager.c
|
|||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ Date: Thu, 10 Jan 2013 09:18:43 +0100
|
|||
Subject: [PATCH] work around Logitech diNovo Edge keyboard firmware issue
|
||||
|
||||
https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/269851
|
||||
https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/1688663
|
||||
---
|
||||
tools/hid2hci.rules | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
|
@ -21,7 +20,7 @@ index db6bb03..7db4572 100644
|
|||
+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[3bc]", \
|
||||
+ RUN+="hid2hci --method=logitech-hid --devpath=%p"
|
||||
+# Logitech, Inc. diNovo Edge Keyboard
|
||||
+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c7[01]4", \
|
||||
+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c714", \
|
||||
RUN+="hid2hci --method=logitech-hid --devpath=%p"
|
||||
|
||||
ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"
|
||||
|
|
|
|||
79
bluez.spec
79
bluez.spec
|
|
@ -5,30 +5,38 @@
|
|||
Summary: Official Linux Bluetooth protocol stack
|
||||
Name: bluez
|
||||
Version: 5.48
|
||||
Release: 3
|
||||
Release: 4
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Group: Communications
|
||||
Url: http://www.bluez.org/
|
||||
Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
|
||||
Source6: pand.conf
|
||||
Source7: dund.conf
|
||||
Source8: hidd.conf
|
||||
Source9: rfcomm.conf
|
||||
Source1: pand.conf
|
||||
Source2: dund.conf
|
||||
Source3: hidd.conf
|
||||
Source4: rfcomm.conf
|
||||
Source5: 97-bluetooth.rules
|
||||
Source10: bluez-uinput.modules
|
||||
# Revert this commit, it leads to huge delay on boot in Plasma 5
|
||||
Patch0: bluez-5.36-systemd-conditional.patch
|
||||
## Ubuntu patches
|
||||
Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
|
||||
# Non-upstream
|
||||
Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
|
||||
Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
|
||||
Patch4: fix-lp1750308-upstream-commit-1bf03369.patch
|
||||
Patch5: fix_build_with_5.2-rc2_kernel_headers.patch
|
||||
Patch6: 0004-agent-Assert-possible-infinite-loop.patch
|
||||
Patch4: 0004-agent-Assert-possible-infinite-loop.patch
|
||||
# Upstream
|
||||
Patch5: fix-lp1750308-upstream-commit-1bf03369.patch
|
||||
Patch6: fix_build_with_5.2-rc2_kernel_headers.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: elfutils-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: sbc-devel
|
||||
BuildRequires: speexdsp-devel
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
|
|
@ -39,9 +47,9 @@ BuildRequires: pkgconfig(libusb-1.0)
|
|||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(udev) >= 186
|
||||
Requires(pre): rpm-helper
|
||||
Suggests: obex-data-server
|
||||
Obsoletes: bluez-alsa < 5.0
|
||||
Obsoletes: bluez-gstreamer < 5.0
|
||||
Suggests: obex-data-server
|
||||
|
||||
%description
|
||||
These are the official Bluetooth communication libraries for Linux.
|
||||
|
|
@ -67,17 +75,17 @@ These are the official Bluetooth communication libraries for Linux.
|
|||
%{_unitdir}/bluetooth.service
|
||||
%{_unitdir}/dbus-org.bluez.service
|
||||
%{_userunitdir}/obex.service
|
||||
%{_mandir}/man1/ciptool.1.*
|
||||
%{_mandir}/man1/btattach.1.*
|
||||
%{_mandir}/man1/hcitool.1.*
|
||||
%{_mandir}/man1/rfcomm.1.*
|
||||
%{_mandir}/man1/sdptool.1.*
|
||||
%{_mandir}/man1/bccmd.1.*
|
||||
%{_mandir}/man1/hciattach.1.*
|
||||
%{_mandir}/man1/hciconfig.1.*
|
||||
%{_mandir}/man1/hcidump.1.*
|
||||
%{_mandir}/man1/l2ping.1.*
|
||||
%{_mandir}/man1/rctest.1.*
|
||||
%{_mandir}/man1/bccmd.1*
|
||||
%{_mandir}/man1/btattach.1*
|
||||
%{_mandir}/man1/ciptool.1*
|
||||
%{_mandir}/man1/hciattach.1*
|
||||
%{_mandir}/man1/hciconfig.1*
|
||||
%{_mandir}/man1/hcitool.1*
|
||||
%{_mandir}/man1/hcidump.1*
|
||||
%{_mandir}/man1/l2ping.1*
|
||||
%{_mandir}/man1/rctest.1*
|
||||
%{_mandir}/man1/rfcomm.1*
|
||||
%{_mandir}/man1/sdptool.1*
|
||||
%{_mandir}/man8/*
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/*
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/*.conf
|
||||
|
|
@ -107,7 +115,7 @@ Requires: cups
|
|||
This package contains the CUPS backend for Bluetooth printers.
|
||||
|
||||
%files cups
|
||||
%{_prefix}/lib/cups/backend/bluetooth
|
||||
%{_libdir}/cups/backend/bluetooth
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -119,7 +127,7 @@ Group: System/Libraries
|
|||
These are the official Bluetooth communication libraries for Linux.
|
||||
|
||||
%files -n %{libname}
|
||||
/%{_lib}/libbluetooth.so.%{major}*
|
||||
%{_libdir}/libbluetooth.so.%{major}*
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -200,12 +208,14 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
|
|||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
#patch4 -p1
|
||||
#patch5 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
libtoolize -f -c
|
||||
autoreconf -fi
|
||||
|
||||
%build
|
||||
autoreconf -vfi
|
||||
%configure2_5x \
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-systemduserunitdir=%{_userunitdir} \
|
||||
|
|
@ -238,20 +248,10 @@ echo "1234" > %{buildroot}%{_sysconfdir}/bluetooth/pin
|
|||
|
||||
chmod 600 %{buildroot}%{_sysconfdir}/bluetooth/pin
|
||||
|
||||
install -m644 %{SOURCE6} -D %{buildroot}%{_sysconfdir}/sysconfig/pand
|
||||
install -m644 %{SOURCE7} -D %{buildroot}%{_sysconfdir}/sysconfig/dund
|
||||
install -m644 %{SOURCE8} -D %{buildroot}%{_sysconfdir}/sysconfig/hidd
|
||||
install -m644 %{SOURCE9} -D %{buildroot}%{_sysconfdir}/sysconfig/rfcomm
|
||||
|
||||
mkdir -p %{buildroot}/%{_lib}
|
||||
mv %{buildroot}%{_libdir}/libbluetooth.so.%{major}* %{buildroot}/%{_lib}
|
||||
ln -srf %{buildroot}/%{_lib}/libbluetooth.so.%{major}.*.* %{buildroot}%{_libdir}/libbluetooth.so
|
||||
|
||||
# Remove the cups backend from libdir, and install it in /usr/lib whatever the install
|
||||
%if "%{_lib}" == "lib64"
|
||||
install -d %{buildroot}%{_prefix}/lib
|
||||
mv %{buildroot}%{_libdir}/cups %{buildroot}%{_prefix}/lib/cups
|
||||
%endif
|
||||
install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/sysconfig/pand
|
||||
install -m644 %{SOURCE2} -D %{buildroot}%{_sysconfdir}/sysconfig/dund
|
||||
install -m644 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/sysconfig/hidd
|
||||
install -m644 %{SOURCE4} -D %{buildroot}%{_sysconfdir}/sysconfig/rfcomm
|
||||
|
||||
cp test/test-* %{buildroot}%{_bindir}
|
||||
cp test/simple-agent %{buildroot}%{_bindir}/simple-agent
|
||||
|
|
@ -271,3 +271,4 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/bluetooth
|
|||
ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service
|
||||
|
||||
sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue