From ddd470f38ef3c752a0c82f26f3a2d1e25bef8d9e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Thu, 12 Feb 2009 23:38:37 +0000
Subject: [PATCH] - Update to 4.30

---
 .cvsignore                                 |  2 +-
 0001-Add-icon-for-other-audio-device.patch | 26 ----------------------
 bluez.spec                                 |  9 ++++----
 sources                                    |  2 +-
 4 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 0001-Add-icon-for-other-audio-device.patch

diff --git a/.cvsignore b/.cvsignore
index 50164ab..db0b8f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bluez-4.29.tar.gz
+bluez-4.30.tar.gz
diff --git a/0001-Add-icon-for-other-audio-device.patch b/0001-Add-icon-for-other-audio-device.patch
deleted file mode 100644
index ec3c845..0000000
--- a/0001-Add-icon-for-other-audio-device.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9c85f509761b3f5484f988c485bc42b555c03871 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 29 Nov 2008 16:17:53 +0000
-Subject: [PATCH] Add icon for other audio device
-
-.
----
- src/dbus-hci.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/dbus-hci.c b/src/dbus-hci.c
-index f2b6f2e..a0de9a0 100644
---- a/src/dbus-hci.c
-+++ b/src/dbus-hci.c
-@@ -85,6 +85,8 @@ const char *class_to_icon(uint32_t class)
- 			return "audio-card";	/* Headset */
- 		case 0x06:
- 			return "audio-card";	/* Headphone */
-+		default:
-+			return "audio-card";	/* Other audio device */
- 		}
- 		break;
- 	case 0x05:
--- 
-1.6.0.4
-
diff --git a/bluez.spec b/bluez.spec
index 8715af1..0a5f49e 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.29
-Release: 3%{?dist}
+Version: 4.30
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@ Source1: bluetooth.init
 Source2: bluetooth.conf
 Source3: bluez-uinput.modules
 Patch1: bluez-utils-oui-usage.patch
-Patch2: 0001-Add-icon-for-other-audio-device.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -96,7 +95,6 @@ use in Bluetooth applications.
 
 %setup -q
 %patch1 -p0 -b .oui
-#patch2 -p1
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -187,6 +185,9 @@ fi
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Thu Feb 12 2009 - Bastien Nocera <bnocera@redhat.com> - 4.30-1
+- Update to 4.30
+
 * Thu Feb 12 2009 Karsten Hopp <karsten@redhat.com> 4.29-3
 - disable 0001-Add-icon-for-other-audio-device.patch, already upstream
 
diff --git a/sources b/sources
index 7837772..7fb0ef4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9198f428277693c16c212910996075b4  bluez-4.29.tar.gz
+f6a4b58907a6bec424247ee572d43a2c  bluez-4.30.tar.gz