rpms/bluez-utils/devel bluez-utils-2.22-dbus-0.60-api.patch, NONE, 1.1 bluez-utils.spec, 1.28, 1.29 bluez-utils-2.15-dbuslate.patch, 1.2, NONE bluez-utils-2.15-new_dbus_api.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16854

Modified Files:
	bluez-utils.spec 
Added Files:
	bluez-utils-2.22-dbus-0.60-api.patch 
Removed Files:
	bluez-utils-2.15-dbuslate.patch 
	bluez-utils-2.15-new_dbus_api.patch 
Log Message:
- rebuild for new dbus


bluez-utils-2.22-dbus-0.60-api.patch:
 dbus.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE bluez-utils-2.22-dbus-0.60-api.patch ---
--- bluez-utils-2.22/hcid/dbus.c.dbus-0.60-api	2005-10-31 13:27:57.000000000 -0500
+++ bluez-utils-2.22/hcid/dbus.c	2005-12-01 18:59:43.000000000 -0500
@@ -425,6 +425,9 @@
 	uint8_t *addr = (uint8_t *) &ci->bdaddr;
 	dbus_bool_t out = ci->out;
 
+	if (!connection && !hcid_dbus_init())
+		goto failed;
+
 	message = dbus_message_new_method_call(PINAGENT_SERVICE_NAME, PINAGENT_PATH,
 						PINAGENT_INTERFACE, PIN_REQUEST);
 	if (message == NULL) {
@@ -827,7 +830,7 @@
 	}
 
 	dbus_bus_request_name(connection, BASE_INTERFACE,
-				DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error);
+			      0, &error);
 
 	if (dbus_error_is_set(&error)) {
 		syslog(LOG_ERR,"Can't get system message bus name: %s\n",


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bluez-utils.spec	6 Nov 2005 09:55:48 -0000	1.28
+++ bluez-utils.spec	2 Dec 2005 00:04:24 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.22
-Release: 1
+Release: 2 
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -13,17 +13,17 @@
 Source7: dund.conf
 Source8: hidd.conf
 Source9: bluetooth.conf
-Patch1: bluez-utils-2.15-dbuslate.patch
+Patch1: bluez-utils-2.22-dbus-0.60-api.patch 
 Patch2: bluez-utils-2.3-conf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 BuildRequires: bluez-libs-devel >= %{version}
 BuildRequires: flex
-BuildRequires: dbus-devel >= 0.31
+BuildRequires: dbus-devel >= 0.60
 ExcludeArch: s390 s390x
 Obsoletes: bluez-pan, bluez-sdp
 Requires: initscripts, bluez-libs >= %{version}
-Requires: dbus >= 0.31
+Requires: dbus >= 0.60
 Prereq: /sbin/chkconfig, /sbin/service
 
 %description
@@ -51,8 +51,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .dbus
+%patch2 -p1 
 
 %build
 aclocal
@@ -108,6 +108,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Thu Dec  1 2005 John (J5) Palmieri <johnp at redhat.com> - 2.22-2
+- rebuild for the new dbus
+
 * Sun Nov  6 2005 David Woodhouse <dwmw2 at redhat.com> 2.22-1
 - Update to bluez-utils 2.22
 


--- bluez-utils-2.15-dbuslate.patch DELETED ---


--- bluez-utils-2.15-new_dbus_api.patch DELETED ---