- Up to 4.94

- Removed patch for bug fixed upstream.

Changed files:
    bluez-try-utf8-harder.patch -> 1.3
    bluez.spec -> 1.73

diff --git a/bluez-try-utf8-harder.patch b/bluez-try-utf8-harder.patch
deleted file mode 100644 (file)
index c762e3a..0000000
--- a/bluez-try-utf8-harder.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- bluez-4.78/src/event.c.orig        2010-11-08 11:58:02.359781937 +0200
-+++ bluez-4.78/src/event.c     2010-11-08 11:58:34.456448604 +0200
-@@ -489,8 +489,16 @@
- 
-               /* It's ok to cast end between const and non-const since
-                * we know it points to inside of name which is non-const */
--              if (!g_utf8_validate(name, -1, (const char **) &end))
--                      *end = '\0';
-+              if (!g_utf8_validate(name, -1, (const char **) &end)) {
-+                      char *utf8_name;
-+
-+                      utf8_name = g_convert(name, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
-+                      if (utf8_name) {
-+                              memcpy(name, utf8_name, 248);
-+                              g_free(utf8_name);
-+                      } else
-+                              *end = '\0';
-+              }
- 
-               write_device_name(local, peer, name);
-       }

diff --git a/bluez.spec b/bluez.spec
index 60fc2836e4b9fa746379a26f4ea988f72a9d88b2..47e08d276759c3ee38459a61393d9ed8ab1b389b 100644 (file)
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,13 +1,13 @@
 Summary:       Bluetooth utilities
 Summary(pl.UTF-8):     Narzędzia Bluetooth
 Name:          bluez
-Version:       4.93
+Version:       4.94
 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: c0f6450a39809996306005f5b85c6d3d
+# Source0-md5: 59040081375411e3000dea9e5d53e5b7
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       dund.init
@@ -15,7 +15,6 @@ Source4:      pand.init
 Source5:       rfcomm.init
 Patch0:                %{name}-etc_dir.patch
 Patch1:                %{name}-wacom-mode-2.patch
-Patch2:                %{name}-try-utf8-harder.patch
 URL:           http://www.bluez.org/
 BuildRequires: alsa-lib-devel >= 1.0.10-1
 BuildRequires: autoconf >= 2.60
@@ -174,7 +173,6 @@ aplikacji Bluetooth.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}