From 03dacbcfecda278f72efed03e46ab8cd8dfc3fa1939fd4889118fdbcf5c6806f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 7 Feb 2009 00:20:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-user-share?expand=0&rev=4 --- gnome-user-share-0.40.tar.bz2 | 3 - gnome-user-share-0.41.tar.bz2 | 3 + gnome-user-share-bluez4.patch | 119 ------------------------- gnome-user-share-httpd-detection.patch | 17 ---- gnome-user-share.changes | 10 +++ gnome-user-share.spec | 23 ++--- 6 files changed, 25 insertions(+), 150 deletions(-) delete mode 100644 gnome-user-share-0.40.tar.bz2 create mode 100644 gnome-user-share-0.41.tar.bz2 delete mode 100644 gnome-user-share-bluez4.patch delete mode 100644 gnome-user-share-httpd-detection.patch diff --git a/gnome-user-share-0.40.tar.bz2 b/gnome-user-share-0.40.tar.bz2 deleted file mode 100644 index 209ef68..0000000 --- a/gnome-user-share-0.40.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92d5cbdfa612eda62e66b5d6558166015c2ab0b3368ad266c8bbeaf1ad1da6bb -size 368898 diff --git a/gnome-user-share-0.41.tar.bz2 b/gnome-user-share-0.41.tar.bz2 new file mode 100644 index 0000000..f47d7f4 --- /dev/null +++ b/gnome-user-share-0.41.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:673aa5c7bd79c35baa16e5f3186bf493c956042c12a32608492e69a34aa92a5b +size 359397 diff --git a/gnome-user-share-bluez4.patch b/gnome-user-share-bluez4.patch deleted file mode 100644 index a470992..0000000 --- a/gnome-user-share-bluez4.patch +++ /dev/null @@ -1,119 +0,0 @@ -Index: src/obexpush.c -=================================================================== ---- src/obexpush.c (revision 259) -+++ src/obexpush.c (working copy) -@@ -184,7 +184,7 @@ - DBusGConnection *connection; - DBusGProxy *manager; - GError *error = NULL; -- char **adapters; -+ GPtrArray *adapters; - gboolean retval = FALSE; - guint i; - -@@ -193,52 +193,74 @@ - return FALSE; - - manager = dbus_g_proxy_new_for_name (connection, "org.bluez", -- "/org/bluez", "org.bluez.Manager"); -+ "/", "org.bluez.Manager"); - if (manager == NULL) { - dbus_g_connection_unref (connection); - return FALSE; - } - -- if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, G_TYPE_STRV, &adapters, G_TYPE_INVALID) == FALSE) { -+ if (dbus_g_proxy_call (manager, "ListAdapters", &error, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &adapters, G_TYPE_INVALID) == FALSE) { - g_object_unref (manager); - dbus_g_connection_unref (connection); - return FALSE; - } - -- for (i = 0; adapters[i] != NULL; i++) { -- DBusGProxy *adapter; -- gboolean bonded, trusted; -+ for (i = 0; i < adapters->len; i++) { -+ DBusGProxy *adapter, *device; -+ char *device_path; -+ GHashTable *props; - -- g_message ("checking adapter %s", adapters[i]); -+ g_message ("checking adapter %s", g_ptr_array_index (adapters, i)); - - adapter = dbus_g_proxy_new_for_name (connection, "org.bluez", -- adapters[i], "org.bluez.Adapter"); -- if (dbus_g_proxy_call (adapter, "HasBonding", NULL, -- G_TYPE_STRING, bdaddr, G_TYPE_INVALID, -- G_TYPE_BOOLEAN, &bonded, G_TYPE_INVALID) != FALSE) { -+ g_ptr_array_index (adapters, i), "org.bluez.Adapter"); -+ -+ if (dbus_g_proxy_call (adapter, "FindDevice", NULL, -+ G_TYPE_STRING, bdaddr, G_TYPE_INVALID, -+ DBUS_TYPE_G_OBJECT_PATH, &device_path, G_TYPE_INVALID) == FALSE) -+ { -+ g_object_unref (adapter); -+ continue; -+ } -+ -+ device = dbus_g_proxy_new_for_name (connection, "org.bluez", device_path, "org.bluez.Device"); -+ -+ if (dbus_g_proxy_call (device, "GetProperties", NULL, -+ G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), -+ &props, G_TYPE_INVALID) != FALSE) -+ { -+ GValue *value; -+ gboolean bonded, trusted; -+ -+ value = g_hash_table_lookup (props, "Paired"); -+ bonded = g_value_get_boolean (value); - g_message ("%s is %s", bdaddr, bonded ? "bonded" : "not bonded"); -- if (bonded != FALSE) { -+ -+ if (bonded) { -+ g_hash_table_destroy (props); -+ g_object_unref (device); -+ g_object_unref (adapter); - retval = TRUE; -- g_object_unref (adapter); - break; - } -- } -- if (accept_setting == ACCEPT_BONDED_AND_TRUSTED && -- dbus_g_proxy_call (adapter, "IsTrusted", NULL, -- G_TYPE_STRING, bdaddr, G_TYPE_INVALID, -- G_TYPE_BOOLEAN, &trusted, G_TYPE_INVALID) != FALSE) { -+ value = g_hash_table_lookup (props, "Trusted"); -+ trusted = g_value_get_boolean (value); - g_message ("%s is %s", bdaddr, trusted ? "trusted" : "not trusted"); -- if (trusted != FALSE) { -+ -+ if (accept_setting == ACCEPT_BONDED_AND_TRUSTED -+ && trusted) { -+ g_hash_table_destroy (props); -+ g_object_unref (device); -+ g_object_unref (adapter); - retval = TRUE; -- g_object_unref (adapter); - break; - } - } -- - g_object_unref(adapter); - } - -- g_strfreev(adapters); -+ g_ptr_array_free (adapters, TRUE); -+ - g_object_unref(manager); - dbus_g_connection_unref(connection); - -@@ -351,7 +373,7 @@ - cancelled_cb (DBusGProxy *session, - gpointer user_data) - { -- //FIXME implement properly -+ //FIXME implement properly, we never actually finished the transfer - g_message ("transfered was cancelled by the sender"); - transfer_completed_cb (session, user_data); - } - diff --git a/gnome-user-share-httpd-detection.patch b/gnome-user-share-httpd-detection.patch deleted file mode 100644 index ad3e179..0000000 --- a/gnome-user-share-httpd-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: gnome-user-share-0.40/configure.in -=================================================================== ---- gnome-user-share-0.40.orig/configure.in -+++ gnome-user-share-0.40/configure.in -@@ -31,10 +31,10 @@ AC_TYPE_SIGNAL - AC_TYPE_SIZE_T - AC_TYPE_UID_T - --AC_PATH_PROG([HTTPD], [httpd],, -+AC_PATH_PROG([HTTPD], [httpd2],, - [$PATH:/usr/sbin]) - --default_httpd_version=`$HTTPD -v | head -1 | sed "s#.*/##" | cut -f 1-2 -d .` -+default_httpd_version=`$HTTPD -v | head -1 | sed "s#^.*Apache/\([^ ]*\).*#\1#" | cut -f 1-2 -d .` - AC_ARG_WITH(httpd-version, [ --with-httpd-version=VERSION Httpd version used.], - HTTPD_VERSION="$withval", HTTPD_VERSION="$default_httpd_version") - diff --git a/gnome-user-share.changes b/gnome-user-share.changes index 6c1e7cf..8b310d3 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Dec 20 10:36:28 EST 2008 - mboman@suse.de + +- Update to version 0.41: + + Port to BlueZ 4.x API + + UI fixes in the preferences dialogue + + Fix web file sharing on some distributions +- Remove gnome-user-share-bluez4.patch. Fixed upstream +- Remove gnome-user-share-httpd-detection.patch. Fixed upstream + ------------------------------------------------------------------- Tue Dec 16 19:45:40 CET 2008 - coolo@suse.de diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 3293898..2c3f4cc 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -1,7 +1,7 @@ # -# spec file for package gnome-user-share (Version 0.40) +# spec file for package gnome-user-share (Version 0.41) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,11 @@ Name: gnome-user-share Summary: GNOME user file sharing -Version: 0.40 -Release: 5 +Version: 0.41 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/File-Sharing Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnome-user-share-bluez4.patch -- Port to bluez4 API, taken from Fedora. -Patch1: gnome-user-share-bluez4.patch -# PATCH-FIX-OPENSUSE gnome-user-share-httpd-detection.patch vuntz@novell.com -- Detect the right binary for apache -Patch2: gnome-user-share-httpd-detection.patch # PATCH-FIX-OPENSUSE gnome-user-share-soft-dep-apache.patch vuntz@novell.com -- Hide apache option in the UI if it's not available Patch3: gnome-user-share-soft-dep-apache.patch Url: http://www.gnome.org/ @@ -71,8 +67,6 @@ Authors: %lang_package %prep %setup -q -%patch1 -p0 -%patch2 -p1 %patch3 -p1 %build @@ -114,6 +108,13 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}.lang %changelog +* Sat Dec 20 2008 mboman@suse.de +- Update to version 0.41: + + Port to BlueZ 4.x API + + UI fixes in the preferences dialogue + + Fix web file sharing on some distributions +- Remove gnome-user-share-bluez4.patch. Fixed upstream +- Remove gnome-user-share-httpd-detection.patch. Fixed upstream * Tue Dec 16 2008 coolo@suse.de - require lang subpackage * Mon Nov 24 2008 vuntz@novell.com @@ -121,6 +122,6 @@ rm -rf $RPM_BUILD_ROOT * Sat Nov 22 2008 aj@suse.de - Fix package list to fix build. - gnome-user-share helper is a binary, put it into libexecdir. -* Thu Nov 20 2008 vuntz@novell.com +* Wed Nov 19 2008 vuntz@novell.com - Import package, based on the one from Fedora. Required to fix bnc#402048.