From 6850fe0531e3aaf2e61b1fe7923066a4476ab4db Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sat, 6 Nov 2010 17:43:13 +0000
Subject: [PATCH] - Update to 4.78

---
 .gitignore                          |  1 +
 0002-build-Fix-parallel-build.patch | 34 -----------------------------
 bluez.spec                          |  7 +++---
 sources                             |  2 +-
 4 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 0002-build-Fix-parallel-build.patch

diff --git a/.gitignore b/.gitignore
index 67dce9d..4bb54ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ bluez-4.70.tar.gz
 /bluez-4.74.tar.gz
 /bluez-4.76.tar.gz
 /bluez-4.77.tar.gz
+/bluez-4.78.tar.gz
diff --git a/0002-build-Fix-parallel-build.patch b/0002-build-Fix-parallel-build.patch
deleted file mode 100644
index e1069d1..0000000
--- a/0002-build-Fix-parallel-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ad21a880935863d3592cae708147ef54c796222d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 27 Oct 2010 18:54:49 +0100
-Subject: [PATCH 2/3] build: Fix parallel build
-
-Fix parallel build where parser.h won't have been generated when
-we're trying to compile kword itself.
-
- YACC   tools/parser.c
- LEX    tools/lexer.c
-conflicts: 3 shift/reduce
- CC     tools/kword.o
-tools/kword.c:36:20: fatal error: parser.h: No such file or directory
-compilation terminated.
----
- Makefile.tools |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.tools b/Makefile.tools
-index 405a42b..797b53d 100644
---- a/Makefile.tools
-+++ b/Makefile.tools
-@@ -12,6 +12,8 @@ sbin_PROGRAMS += tools/hciattach tools/hciconfig
- noinst_PROGRAMS += tools/avinfo tools/ppporc \
- 				tools/hcieventmask tools/hcisecfilter
- 
-+tools/kword.c: tools/parser.h
-+
- tools_rfcomm_SOURCES = tools/main.c tools/parser.y tools/lexer.l \
- 					tools/kword.h tools/kword.c
- EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \
--- 
-1.7.3.1
-
diff --git a/bluez.spec b/bluez.spec
index 15c71f4..6d1302e 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,6 +1,6 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.77
+Version: 4.78
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -12,8 +12,6 @@ Source6: pand.conf
 Source7: rfcomm.init
 Source8: bluez-uinput.modules
 
-# http://thread.gmane.org/gmane.linux.bluez.kernel/8645
-Patch1: 0002-build-Fix-parallel-build.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=450081
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
 Patch2: bluez-try-utf8-harder.patch
@@ -290,6 +288,9 @@ fi
 %{_mandir}/man1/pand.1.gz
 
 %changelog
+* Sat Nov 06 2010 Bastien Nocera <bnocera@redhat.com> 4.78-1
+- Update to 4.78
+
 * Wed Oct 27 2010 Bastien Nocera <bnocera@redhat.com> 4.77-1
 - Update to 4.77
 
diff --git a/sources b/sources
index a817d95..b8f959c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58644b9d65bc7c73a19e9a38f56b165d  bluez-4.77.tar.gz
+2587846014db01baa1659a04a9185e53  bluez-4.78.tar.gz