rpms/bluez/F-12 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.6, 1.7

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19913

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch 
Log Message:
update cable pairing patch

0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   16 ++
 configure.ac    |    1 
 plugins/cable.c |  363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 388 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:38:20 -0000	1.6
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:48:15 -0000	1.7
@@ -1,4 +1,4 @@
-From 3727fcbf09a33550698cdda2a2d0a7afa31e594a Mon Sep 17 00:00:00 2001
+From df50f89ea8967fa0ba0d21aac0ce905801d31c70 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -11,10 +11,10 @@ the device is selected, poked around to 
 address, and added to the database of the current default adapter.
 ---
  Makefile.am     |    9 ++
- acinclude.m4    |   15 +++
+ acinclude.m4    |   16 +++
  configure.ac    |    1 +
  plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 387 insertions(+), 0 deletions(-)
+ 4 files changed, 388 insertions(+), 0 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
@@ -38,7 +38,7 @@ index c8337d6..0bdf694 100644
  builtin_sources += plugins/hciops.c
  
 diff --git a/acinclude.m4 b/acinclude.m4
-index e7d1c32..54802be 100644
+index e7d1c32..3feddf8 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -73,17 +73,18 @@ index e7d1c32..54802be 100644
  	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
  		netlink_enable=${enableval}
  	])
-@@ -324,6 +335,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 
- 	if (test "${capng_enable}" = "yes" && test "${capng_found}" = "yes"); then
+@@ -326,6 +337,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
-+
-+	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
-+		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
  	fi
  
++	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
++		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
++	fi
++
  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
-@@ -350,4 +364,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
+ 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
+@@ -350,4 +365,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
  	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")