rpms/obex-data-server/devel obex-data-server-0.3.4-bluez4.patch, 1.2, 1.3 obex-data-server.spec, 1.10, 1.11

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/obex-data-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12973

Modified Files:
	obex-data-server-0.3.4-bluez4.patch obex-data-server.spec 
Log Message:
* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-5
- Another BlueZ 4.x patch update


obex-data-server-0.3.4-bluez4.patch:

Index: obex-data-server-0.3.4-bluez4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server-0.3.4-bluez4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obex-data-server-0.3.4-bluez4.patch	12 Sep 2008 16:53:24 -0000	1.2
+++ obex-data-server-0.3.4-bluez4.patch	12 Sep 2008 17:19:54 -0000	1.3
@@ -1,35 +1,25 @@
-Index: src/ods-bluez.c
-===================================================================
---- src/ods-bluez.c	(revision 1878)
-+++ src/ods-bluez.c	(working copy)
-@@ -109,18 +109,18 @@
- ods_bluez_init (OdsBluez *bluez)
- {
- 	GError		*error = NULL;
--	gchar		*adapter_object = NULL;
-+	char		*adapter_object = NULL;
- 
- 	OdsBluezClass *klass = ODS_BLUEZ_GET_CLASS (bluez);
- 	bluez->priv = ODS_BLUEZ_GET_PRIVATE (bluez);
- 
+--- obex-data-server-0.3.4.old/src/ods-bluez.c	2008-06-27 16:21:14.000000000 +0100
++++ obex-data-server-0.3.4/src/ods-bluez.c	2008-09-12 18:17:27.000000000 +0100
+@@ -121,11 +121,11 @@ ods_bluez_init (OdsBluez *bluez)
+ 	
  	bluez->priv->manager_proxy = dbus_g_proxy_new_for_name (klass->connection,
- 															"org.bluez",
--															"/org/bluez",
-+															"/",
+ 															"org.bluez", 
+-															"/org/bluez", 
++															"/", 
  															"org.bluez.Manager");
- 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error,
+ 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error, 
  								G_TYPE_INVALID,
--								G_TYPE_STRING, &adapter_object,
+-								G_TYPE_STRING, &adapter_object, 
 +								DBUS_TYPE_G_OBJECT_PATH, &adapter_object,
  								G_TYPE_INVALID)) {
  		g_warning("Unable to connect to dbus: %s", error->message);
  		g_clear_error (&error);
-@@ -349,7 +349,7 @@
+@@ -314,7 +314,7 @@ get_remote_service_record_cb (DBusGProxy
  		goto err;
  	}
- 
+ 	
 -	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
 +	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
- 
+ 	
  	/* get channel for this service */
  	if (sdp_get_access_protos (sdp_record, &protos) != 0) {


Index: obex-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/obex-data-server/devel/obex-data-server.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- obex-data-server.spec	12 Sep 2008 16:53:25 -0000	1.10
+++ obex-data-server.spec	12 Sep 2008 17:19:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:		obex-data-server
 Version:	0.3.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
 Summary:	D-Bus service for Obex access
 
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .bluez4
+%patch0 -p1 -b .bluez4
 
 %build
 %configure
@@ -63,6 +63,9 @@
 %{_mandir}/man1/obex-data-server.1.gz
 
 %changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-5
+- Another BlueZ 4.x patch update
+
 * Fri Sep 12 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.4-4
 - Update bluez 4.x patch for the latest D-Bus API