Update to 4.45-1. wacom patches added. (all by Przemysław Firszt).

Changed files:
    bluez-wacom-mode-2.patch -> 1.1
    bluez.spec -> 1.30

diff --git a/bluez-wacom-mode-2.patch b/bluez-wacom-mode-2.patch
new file mode 100644 (file)
index 0000000..0f5b585
--- /dev/null
+++ b/bluez-wacom-mode-2.patch
@@ -0,0 +1,23 @@
+--- a/input/device.c
++++ b/input/device.c
+@@ -658,6 +658,19 @@ static int hidp_add_connection(const struct input_device *idev,
+               err = write(sk, buf, sizeof(buf));
+       }
+ 
++      if (req->vendor == 0x056a && req->product == 0x81) {
++              unsigned char buf[3];
++              int sk = g_io_channel_unix_get_fd(iconn->ctrl_io);
++
++              buf[0] = 0x53; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
++              buf[1] = 0x03; buf[2] = 0x00;
++              write(sk, buf, sizeof(buf));
++
++              buf[0] = 0x53; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
++              /* 0x06 - high reporting speed, 0x05 - low speed */
++              buf[1] = 0x05; buf[2] = 0x00;
++              write(sk, buf, sizeof(buf));
++      }
+       err = ioctl_connadd(req);
+ 
+ cleanup:
+

diff --git a/bluez.spec b/bluez.spec
index aa7192f7dc3ae307ed6ea390f62f39e038283dd8..71b83fd6517e2503204c90609c4de1c75de729e9 100644 (file)
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,19 +1,19 @@
 Summary:       Bluetooth utilities
 Summary(pl.UTF-8):     Narzędzia Bluetooth
 Name:          bluez
-Version:       4.42
+Version:       4.45
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 #Source0Download: http://www.bluez.org/download.html
 Source0:       http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
-# Source0-md5: d24dfd3ca42847123e29f58b29af6948
+# Source0-md5: fb1a02a8008326eabe383dc6fb01b05d
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-udev.rules
 Source4:       %{name}-udev.script
 Patch0:                %{name}-etc_dir.patch
-Patch1:                %{name}-udev-path.patch
+Patch2:                %{name}-wacom-mode-2.patch
 URL:           http://www.bluez.org/
 BuildRequires: alsa-lib-devel >= 1.0.10-1
 BuildRequires: autoconf >= 2.50
@@ -28,6 +28,7 @@ BuildRequires:        libsndfile-devel
 BuildRequires: libtool
 BuildRequires: libusb-compat-devel
 BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: udev-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      rc-scripts
@@ -167,7 +168,7 @@ aplikacji Bluetooth.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -193,10 +194,11 @@ aplikacji Bluetooth.
        --enable-netlink \
        --enable-network \
        --enable-pand \
-       --enable-pcmciarules \
+       --enable-pcmcia \
        --enable-serial \
        --enable-tools \
-       --enable-usb
+       --enable-usb \
+       --enable-udevrules 
 
 %{__make} \
        cupsdir=%{cupsdir} \
@@ -219,7 +221,7 @@ install network/network.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/70-bluetooth.rules
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/bluetooth.rules
 install %{SOURCE4} $RPM_BUILD_ROOT%{udevdir}/bluetooth.sh
 rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.{,l}a
 rm -f $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{,l}a
@@ -260,9 +262,10 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/bluetooth.conf
 %attr(755,root,root) %{udevdir}/bluetooth.sh
 %attr(755,root,root) %{udevdir}/bluetooth_serial
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth-hid2hci.rules
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth-serial.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/97-bluetooth.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/97-bluetooth-hid2hci.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/97-bluetooth-serial.rules
 %{_mandir}/man[18]/*
 
 %files -n alsa-plugins-bluetooth