From 7efec250e15440c702cd985d39c598b6c8a27ea91c8eaa5972a8bdc1b22f419c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Nov 2011 08:19:53 +0000 Subject: [PATCH 1/6] Accepting request 93768 from home:dimstar:branches:GNOME:Factory Update to 3.3.2 - stop installing la files alltogether OBS-URL: https://build.opensuse.org/request/show/93768 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=83 --- gnome-bluetooth-3.2.1.tar.bz2 | 3 - gnome-bluetooth-3.3.2.tar.bz2 | 3 + gnome-bluetooth-fix-crash.patch | 106 ++++++++++++-------------------- gnome-bluetooth.changes | 22 +++++++ gnome-bluetooth.spec | 28 +++------ 5 files changed, 73 insertions(+), 89 deletions(-) delete mode 100644 gnome-bluetooth-3.2.1.tar.bz2 create mode 100644 gnome-bluetooth-3.3.2.tar.bz2 diff --git a/gnome-bluetooth-3.2.1.tar.bz2 b/gnome-bluetooth-3.2.1.tar.bz2 deleted file mode 100644 index b479da5..0000000 --- a/gnome-bluetooth-3.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b399e0855c446bd729900642bd7a64a0189162383de5caaaf0150ee9e2d2121b -size 1350014 diff --git a/gnome-bluetooth-3.3.2.tar.bz2 b/gnome-bluetooth-3.3.2.tar.bz2 new file mode 100644 index 0000000..4926e76 --- /dev/null +++ b/gnome-bluetooth-3.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58c21d26781729ed5b4e80e985f6f37b94af7fb830b525642046750537d16c57 +size 1394849 diff --git a/gnome-bluetooth-fix-crash.patch b/gnome-bluetooth-fix-crash.patch index 455b54f..b1bfc2c 100644 --- a/gnome-bluetooth-fix-crash.patch +++ b/gnome-bluetooth-fix-crash.patch @@ -13,11 +13,44 @@ https://bugzilla.gnome.org/show_bug.cgi?id=654172 lib/bluetooth-client.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) -diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c -index 86680c3..d7af201 100644 ---- a/lib/bluetooth-client.c -+++ b/lib/bluetooth-client.c -@@ -1021,6 +1021,37 @@ bluetooth_client_set_property (GObject *object, +Index: gnome-bluetooth-3.3.2/lib/bluetooth-client.c +=================================================================== +--- gnome-bluetooth-3.3.2.orig/lib/bluetooth-client.c ++++ gnome-bluetooth-3.3.2/lib/bluetooth-client.c +@@ -80,6 +80,7 @@ struct _BluetoothClientPrivate { + Manager *manager; + GtkTreeStore *store; + GtkTreeRowReference *default_adapter; ++ GSList *horrible_workaround_for_leaked_ifaces; + }; + + enum { +@@ -323,6 +324,7 @@ get_properties_for_iface (GDBusProxy *pr + static GHashTable * + device_list_nodes (Device *device, BluetoothClient *client) + { ++ BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); + GHashTable *table; + guint i; + +@@ -348,6 +350,8 @@ device_list_nodes (Device *device, Bluet + g_hash_table_lookup (table, BLUEZ_AUDIOSINK_INTERFACE) == NULL) { + continue; + } ++ ++ priv->horrible_workaround_for_leaked_ifaces = g_slist_append (priv->horrible_workaround_for_leaked_ifaces, iface); + } + + /* And skip interface if it's already in the hash table */ +@@ -1001,6 +1005,7 @@ bluez_vanished_cb (GDBusConnection *conn + static void bluetooth_client_init(BluetoothClient *client) + { + BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); ++ GSList *l; + + priv->store = gtk_tree_store_new(_BLUETOOTH_NUM_COLUMNS, G_TYPE_OBJECT, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, +@@ -1260,6 +1265,37 @@ bluetooth_client_set_property (GObject } } @@ -55,70 +88,14 @@ index 86680c3..d7af201 100644 static void bluetooth_client_finalize(GObject *client) { BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); -@@ -1041,6 +1072,8 @@ static void bluetooth_client_finalize(GObject *client) - default_adapter_changed, client); +@@ -1270,11 +1306,22 @@ static void bluetooth_client_finalize(GO + g_object_unref(priv->manager); + gtk_tree_model_foreach (GTK_TREE_MODEL(priv->store), disconnect_from_proxy_helper, client); + g_object_unref(priv->store); - if (priv->default_adapter) --- -1.7.7 - - -From 63b442bb8a81776887350bad516943ddd61852b8 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Tue, 11 Oct 2011 09:46:52 +0200 -Subject: [PATCH 2/2] lib: Do not leak proxies for detectable interfaces of - devices - -This avoids signals that will cause crashes. - -https://bugzilla.gnome.org/show_bug.cgi?id=654172 ---- - lib/bluetooth-client.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c -index d7af201..e2f66c7 100644 ---- a/lib/bluetooth-client.c -+++ b/lib/bluetooth-client.c -@@ -103,6 +103,7 @@ struct _BluetoothClientPrivate { - DBusGProxy *manager; - GtkTreeStore *store; - GtkTreeRowReference *default_adapter; -+ GSList *horrible_workaround_for_leaked_ifaces; - }; - - enum { -@@ -266,6 +267,7 @@ device_services_changed (DBusGProxy *iface, const char *property, - static GHashTable * - device_list_nodes (DBusGProxy *device, BluetoothClient *client, gboolean connect_signal) - { -+ BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); - GHashTable *table; - guint i; - -@@ -333,6 +335,8 @@ device_list_nodes (DBusGProxy *device, BluetoothClient *client, gboolean connect - dbus_g_proxy_connect_signal(iface, "PropertyChanged", - G_CALLBACK(device_services_changed), client, NULL); - } -+ -+ priv->horrible_workaround_for_leaked_ifaces = g_slist_append (priv->horrible_workaround_for_leaked_ifaces, iface); - } - } - -@@ -1055,6 +1059,7 @@ disconnect_from_proxy_helper (GtkTreeModel *model, - static void bluetooth_client_finalize(GObject *client) - { - BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); -+ GSList *l; - - DBG("client %p", client); - -@@ -1079,6 +1084,15 @@ static void bluetooth_client_finalize(GObject *client) if (priv->default_adapter) gtk_tree_row_reference_free (priv->default_adapter); @@ -134,6 +111,3 @@ index d7af201..e2f66c7 100644 G_OBJECT_CLASS(bluetooth_client_parent_class)->finalize(client); } --- -1.7.7 - diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 7d835e2..3449704 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Nov 26 15:16:06 UTC 2011 - dimstar@opensuse.org + +- Remove all .la files. gnome-bluetooth-applet.la on its own has + reference to the other la files. Keeping some of them breaks more + than it serves. + +------------------------------------------------------------------- +Mon Nov 21 17:03:09 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Library: + - Clean up public API + - Port to GDBus + - Small UI fixes to the chooser + + Properties: + - Move to gnome-control-center + + Wizard: + - Remove special-case Wiimote handling (now in Bluez) + - Remove multi-adapter support + + Updated translations. + ------------------------------------------------------------------- Mon Oct 17 17:49:47 CEST 2011 - dimstar@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index bd270e1..fb79c9c 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -18,18 +18,16 @@ Name: gnome-bluetooth -Version: 3.2.1 +Version: 3.3.2 Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Url: http://live.gnome.org/GnomeBluetooth Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/gnome-bluetooth/3.2/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-bluetooth/3.3/%{name}-%{version}.tar.bz2 Source1: 61-gnome-bluetooth-rfkill.rules # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch -# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-crash.patch bgo#654172 bnc#722722 vuntz@opensuse.org -- Fix various crashes in libgnome-bluetooth due to leaking objects -Patch1: gnome-bluetooth-fix-crash.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel @@ -77,13 +75,13 @@ enables you to send files. It is used by the Nautilus component -- select the files you want to send and choose "Send via Bluetooth..." from the context menu. -%package -n libgnome-bluetooth8 +%package -n libgnome-bluetooth9 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Group: System/GUI/GNOME Obsoletes: libgnomebt1 <= 0.12 -%description -n libgnome-bluetooth8 +%description -n libgnome-bluetooth9 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. @@ -114,7 +112,6 @@ send files over bluetooth. %setup -q translation-update-upstream %patch0 -p1 -%patch1 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh @@ -134,13 +131,8 @@ translation-update-upstream %install %makeinstall -# keep libgnome-bluetooth-applet.la -rm -f %{buildroot}%{_libdir}/libgnome-bluetooth.la \ - %{buildroot}%{_libdir}/gnome-bluetooth/plugins/*.la \ - %{buildroot}%{_libdir}/nautilus-sendto/plugins/*.la \ - %{buildroot}/%{_libdir}/control-center-1/panels/libbluetooth.la +find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %suse_update_desktop_file bluetooth-applet -%suse_update_desktop_file bluetooth-properties %suse_update_desktop_file bluetooth-sendto %suse_update_desktop_file bluetooth-wizard %find_lang %{name}2 %{?no_lang_C} @@ -167,9 +159,9 @@ rm -rf %{buildroot} %postun -n nautilus-sendto-plugin-bluetooth %glib2_gsettings_schema_postun -%post -n libgnome-bluetooth8 -p /sbin/ldconfig +%post -n libgnome-bluetooth9 -p /sbin/ldconfig -%postun -n libgnome-bluetooth8 -p /sbin/ldconfig +%postun -n libgnome-bluetooth9 -p /sbin/ldconfig %files %defattr(-, root, root) @@ -184,15 +176,11 @@ rm -rf %{buildroot} /lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules %{_bindir}/bluetooth-* %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop -%{_datadir}/applications/bluetooth-properties.desktop %{_datadir}/applications/bluetooth-sendto.desktop %{_datadir}/applications/bluetooth-wizard.desktop %{_datadir}/gnome-bluetooth/ %{_datadir}/icons/hicolor/*/*/bluetooth* %{_mandir}/man1/bluetooth-* -%dir %{_libdir}/control-center-1 -%dir %{_libdir}/control-center-1/panels -%{_libdir}/control-center-1/panels/libbluetooth.so # Own the plugin directory, but exclude the plugin library itself %dir %{_libdir}/gnome-bluetooth %{_libdir}/gnome-bluetooth/libgnome-bluetooth-applet.* @@ -203,7 +191,7 @@ rm -rf %{buildroot} %files lang -f %{name}2.lang -%files -n libgnome-bluetooth8 +%files -n libgnome-bluetooth9 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* %{_libdir}/girepository-1.0/GnomeBluetooth-1.0.typelib From 33fb342422ae0efb3e854c87df246fe4f1f9c96b87b59a9a8c07844b8d649039 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 12 Dec 2011 15:55:27 +0000 Subject: [PATCH 2/6] Accepting request 96146 from home:dimstar:branches:GNOME:Factory Push typelib change branch OBS-URL: https://build.opensuse.org/request/show/96146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=84 --- gnome-bluetooth.changes | 5 +++++ gnome-bluetooth.spec | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 3449704..a5b9cfd 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 8 20:03:29 UTC 2011 - dimstar@opensuse.org + +- Split typelib file in typelib-1_0-GnomeBluetooth-1_0. + ------------------------------------------------------------------- Sat Nov 26 15:16:06 UTC 2011 - dimstar@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index fb79c9c..6fcf931 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -61,6 +61,7 @@ License: GPLv2+ Summary: GNOME Bluetooth Support Group: Development/Libraries/GNOME Requires: %{name} = %{version} +Requires: typelib-1_0-GnomeBluetooth-1_0 = %{version} Requires: gtk2-devel Obsoletes: libgnomebt-devel < 0.12 Provides: libgnomebt-devel = 0.12 @@ -85,6 +86,14 @@ Obsoletes: libgnomebt1 <= 0.12 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. +%package -n typelib-1_0-GnomeBluetooth-1_0 +Summary: GNOME Bluetooth graphical utilities +Group: System/GUI/GNOME + +%description -n typelib-1_0-GnomeBluetooth-1_0 +The gnome-bluetooth package contains graphical utilities to setup, +monitor and use Bluetooth devices. + %package plugins-geoclue License: GPLv2+ Summary: GNOME Bluetooth Support @@ -194,6 +203,9 @@ rm -rf %{buildroot} %files -n libgnome-bluetooth9 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* + +%files -n typelib-1_0-GnomeBluetooth-1_0 +%defattr(-,root,root) %{_libdir}/girepository-1.0/GnomeBluetooth-1.0.typelib %files devel From efd23b93cc88b0a161f40a60f1e8404bea9c7b65ab8b254990f1606cafe66406 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 05:06:03 +0000 Subject: [PATCH 3/6] Accepting request 97451 from home:vuntz:branches:GNOME:Factory cleanup OBS-URL: https://build.opensuse.org/request/show/97451 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=85 --- gnome-bluetooth-fix-crash.patch | 113 ----------------------------- gnome-bluetooth-no-dbus-glib.patch | 60 +++++++++++++++ gnome-bluetooth.changes | 27 ++++++- gnome-bluetooth.spec | 37 ++++------ 4 files changed, 98 insertions(+), 139 deletions(-) delete mode 100644 gnome-bluetooth-fix-crash.patch create mode 100644 gnome-bluetooth-no-dbus-glib.patch diff --git a/gnome-bluetooth-fix-crash.patch b/gnome-bluetooth-fix-crash.patch deleted file mode 100644 index b1bfc2c..0000000 --- a/gnome-bluetooth-fix-crash.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 00e1b334b3014ce9ed72b5d3391313467d6fe181 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Fri, 7 Oct 2011 15:46:51 +0200 -Subject: [PATCH 1/2] lib: Disconnect signals from adapters and devices on - finalize - -This avoids some crashes. - -https://bugzilla.gnome.org/show_bug.cgi?id=661118 - -https://bugzilla.gnome.org/show_bug.cgi?id=654172 ---- - lib/bluetooth-client.c | 33 +++++++++++++++++++++++++++++++++ - 1 files changed, 33 insertions(+), 0 deletions(-) - -Index: gnome-bluetooth-3.3.2/lib/bluetooth-client.c -=================================================================== ---- gnome-bluetooth-3.3.2.orig/lib/bluetooth-client.c -+++ gnome-bluetooth-3.3.2/lib/bluetooth-client.c -@@ -80,6 +80,7 @@ struct _BluetoothClientPrivate { - Manager *manager; - GtkTreeStore *store; - GtkTreeRowReference *default_adapter; -+ GSList *horrible_workaround_for_leaked_ifaces; - }; - - enum { -@@ -323,6 +324,7 @@ get_properties_for_iface (GDBusProxy *pr - static GHashTable * - device_list_nodes (Device *device, BluetoothClient *client) - { -+ BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); - GHashTable *table; - guint i; - -@@ -348,6 +350,8 @@ device_list_nodes (Device *device, Bluet - g_hash_table_lookup (table, BLUEZ_AUDIOSINK_INTERFACE) == NULL) { - continue; - } -+ -+ priv->horrible_workaround_for_leaked_ifaces = g_slist_append (priv->horrible_workaround_for_leaked_ifaces, iface); - } - - /* And skip interface if it's already in the hash table */ -@@ -1001,6 +1005,7 @@ bluez_vanished_cb (GDBusConnection *conn - static void bluetooth_client_init(BluetoothClient *client) - { - BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); -+ GSList *l; - - priv->store = gtk_tree_store_new(_BLUETOOTH_NUM_COLUMNS, G_TYPE_OBJECT, - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, -@@ -1260,6 +1265,37 @@ bluetooth_client_set_property (GObject - } - } - -+static gboolean -+disconnect_from_proxy_helper (GtkTreeModel *model, -+ GtkTreePath *path, -+ GtkTreeIter *iter, -+ gpointer data) -+{ -+ BluetoothClient *client = data; -+ DBusGProxy *proxy; -+ -+ gtk_tree_model_get(model, iter, -+ BLUETOOTH_COLUMN_PROXY, &proxy, -1); -+ -+ /* adapters */ -+ g_signal_handlers_disconnect_by_func(proxy, -+ adapter_changed, client); -+ g_signal_handlers_disconnect_by_func(proxy, -+ device_created, client); -+ g_signal_handlers_disconnect_by_func(proxy, -+ device_removed, client); -+ g_signal_handlers_disconnect_by_func(proxy, -+ device_found, client); -+ -+ /* devices */ -+ g_signal_handlers_disconnect_by_func(proxy, -+ device_changed, client); -+ -+ g_object_unref(proxy); -+ -+ return FALSE; -+} -+ - static void bluetooth_client_finalize(GObject *client) - { - BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); -@@ -1270,11 +1306,22 @@ static void bluetooth_client_finalize(GO - - g_object_unref(priv->manager); - -+ gtk_tree_model_foreach (GTK_TREE_MODEL(priv->store), disconnect_from_proxy_helper, client); -+ - g_object_unref(priv->store); - - if (priv->default_adapter) - gtk_tree_row_reference_free (priv->default_adapter); - -+ for (l = priv->horrible_workaround_for_leaked_ifaces; l != NULL; l = l->next) { -+ DBusGProxy *iface = l->data; -+ -+ g_signal_handlers_disconnect_by_func(iface, -+ device_services_changed, client); -+ g_object_unref (iface); -+ } -+ g_slist_free (priv->horrible_workaround_for_leaked_ifaces); -+ - G_OBJECT_CLASS(bluetooth_client_parent_class)->finalize(client); - } - diff --git a/gnome-bluetooth-no-dbus-glib.patch b/gnome-bluetooth-no-dbus-glib.patch new file mode 100644 index 0000000..d4871c5 --- /dev/null +++ b/gnome-bluetooth-no-dbus-glib.patch @@ -0,0 +1,60 @@ +Index: gnome-bluetooth-3.3.2/lib/Makefile.am +=================================================================== +--- gnome-bluetooth-3.3.2.orig/lib/Makefile.am ++++ gnome-bluetooth-3.3.2/lib/Makefile.am +@@ -76,8 +76,8 @@ introspection_files = \ + $(libgnome_bluetooth_c_sources) + + GnomeBluetooth-1.0.gir: libgnome-bluetooth.la +-GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 DBusGLib-1.0 GModule-2.0 +-GnomeBluetooth_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 dbus-glib-1 gmodule-2.0 glib-2.0 ++GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GModule-2.0 ++GnomeBluetooth_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 gmodule-2.0 glib-2.0 + GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) + GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la + GnomeBluetooth_1_0_gir_SCANNERFLAGS = --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 +Index: gnome-bluetooth-3.3.2/lib/Makefile.in +=================================================================== +--- gnome-bluetooth-3.3.2.orig/lib/Makefile.in ++++ gnome-bluetooth-3.3.2/lib/Makefile.in +@@ -453,8 +453,8 @@ INTROSPECTION_COMPILER_ARGS = --included + @HAVE_INTROSPECTION_TRUE@ $(libgnome_bluetooth_introspect_headers) \ + @HAVE_INTROSPECTION_TRUE@ $(libgnome_bluetooth_c_sources) + +-@HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 DBusGLib-1.0 GModule-2.0 +-@HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 dbus-glib-1 gmodule-2.0 glib-2.0 ++@HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GModule-2.0 ++@HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 gmodule-2.0 glib-2.0 + @HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) + @HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la + @HAVE_INTROSPECTION_TRUE@GnomeBluetooth_1_0_gir_SCANNERFLAGS = --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 +Index: gnome-bluetooth-3.3.2/applet/Makefile-lib.am +=================================================================== +--- gnome-bluetooth-3.3.2.orig/applet/Makefile-lib.am ++++ gnome-bluetooth-3.3.2/applet/Makefile-lib.am +@@ -21,8 +21,8 @@ INTROSPECTION_COMPILER_ARGS = --included + if HAVE_INTROSPECTION + GnomeBluetoothApplet-1.0.gir: libgnome-bluetooth-applet.la + GnomeBluetoothApplet_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --include-uninstalled=$(top_builddir)/lib/GnomeBluetooth-1.0.gir +-GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 DBusGLib-1.0 GModule-2.0 +-GnomeBluetoothApplet_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 dbus-glib-1 gmodule-2.0 glib-2.0 ++GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GModule-2.0 ++GnomeBluetoothApplet_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 gmodule-2.0 glib-2.0 + GnomeBluetoothApplet_1_0_gir_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/lib + GnomeBluetoothApplet_1_0_gir_LIBS = libgnome-bluetooth-applet.la + GnomeBluetoothApplet_1_0_gir_FILES = $(libgnome_bluetooth_applet_la_SOURCES) ../lib/bluetooth-enums.h +Index: gnome-bluetooth-3.3.2/applet/Makefile.in +=================================================================== +--- gnome-bluetooth-3.3.2.orig/applet/Makefile.in ++++ gnome-bluetooth-3.3.2/applet/Makefile.in +@@ -356,8 +356,8 @@ INTROSPECTION_GIRS = $(am__append_1) + INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) + INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_builddir)/lib + @HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --include-uninstalled=$(top_builddir)/lib/GnomeBluetooth-1.0.gir +-@HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 DBusGLib-1.0 GModule-2.0 +-@HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 dbus-glib-1 gmodule-2.0 glib-2.0 ++@HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GModule-2.0 ++@HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 gmodule-2.0 glib-2.0 + @HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/lib + @HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_LIBS = libgnome-bluetooth-applet.la + @HAVE_INTROSPECTION_TRUE@GnomeBluetoothApplet_1_0_gir_FILES = $(libgnome_bluetooth_applet_la_SOURCES) ../lib/bluetooth-enums.h diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index a5b9cfd..0bcbe40 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,14 +1,30 @@ +------------------------------------------------------------------- +Wed Dec 21 01:17:36 UTC 2011 - vuntz@opensuse.org + +- Remove gtk2-devel Requires from devel subpackage: it will + automatically be added the pkgconfig() way. +- Rewrite summary and description of devel subpackage. +- Change group of libgnome-bluetooth9 and + typelib-1_0-GnomeBluetooth-1_0 from System/GUI/GNOME to + System/Libraries. +- Add gnome-bluetooth-no-dbus-glib.patch: finish removing dbus-glib + usage in the build system. +- Remove pkgconfig(dbus-glib-1) BuildRequires: it is gone since + version 3.3.2. + ------------------------------------------------------------------- Thu Dec 8 20:03:29 UTC 2011 - dimstar@opensuse.org -- Split typelib file in typelib-1_0-GnomeBluetooth-1_0. +- Split typelib file into typelib-1_0-GnomeBluetooth-1_0 + subpackage. +- Add typelib-1_0-GnomeBluetooth-1_0 Requires to devel subpackage. ------------------------------------------------------------------- Sat Nov 26 15:16:06 UTC 2011 - dimstar@opensuse.org -- Remove all .la files. gnome-bluetooth-applet.la on its own has - reference to the other la files. Keeping some of them breaks more - than it serves. +- Remove all .la files: gnome-bluetooth-applet.la on its own has + reference to the other la files, so keeping some of them breaks + more than it serves. ------------------------------------------------------------------- Mon Nov 21 17:03:09 UTC 2011 - dimstar@opensuse.org @@ -24,6 +40,9 @@ Mon Nov 21 17:03:09 UTC 2011 - dimstar@opensuse.org - Remove special-case Wiimote handling (now in Bluez) - Remove multi-adapter support + Updated translations. +- Drop gnome-bluetooth-fix-crash.patch: fixed upstream another way. +- Rename libgnome-bluetooth8 to libgnome-bluetooth9, following + soversion bump. ------------------------------------------------------------------- Mon Oct 17 17:49:47 CEST 2011 - dimstar@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 6fcf931..c18374a 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -16,18 +16,19 @@ # - Name: gnome-bluetooth Version: 3.3.2 -Release: 1 -License: GPLv2+ +Release: 0 Summary: GNOME Bluetooth graphical utilities -Url: http://live.gnome.org/GnomeBluetooth +License: GPL-2.0+ Group: System/GUI/GNOME +Url: http://live.gnome.org/GnomeBluetooth Source: http://download.gnome.org/sources/gnome-bluetooth/3.3/%{name}-%{version}.tar.bz2 Source1: 61-gnome-bluetooth-rfkill.rules # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-no-dbus-glib.patch bgo#666630 vuntz@opensuse.org -- Finish removing dbus-glib usage in the build system +Patch1: gnome-bluetooth-no-dbus-glib.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel @@ -35,7 +36,6 @@ BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gtk+-3.0) >= 2.90.7 BuildRequires: pkgconfig(nautilus-sendto) %if 0%{?BUILD_FROM_VCS} @@ -57,29 +57,20 @@ The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. %package devel -License: GPLv2+ -Summary: GNOME Bluetooth Support +Summary: GNOME Bluetooth graphical utilities -- Development Files Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: typelib-1_0-GnomeBluetooth-1_0 = %{version} -Requires: gtk2-devel Obsoletes: libgnomebt-devel < 0.12 Provides: libgnomebt-devel = 0.12 %description devel -This package contains a controller class, GnomebtController, to control -Bluetooth devices and a simple GUI to explore which devices are -available (gnome-bluetooth-manager). An OBEX server is available, -gnome-obex-server. This receives files sent via Bluetooth to your PC -and saves them in your home directory. The program gnome-obex-send -enables you to send files. It is used by the Nautilus component -- -select the files you want to send and choose "Send via Bluetooth..." -from the context menu. +The gnome-bluetooth package contains graphical utilities to setup, +monitor and use Bluetooth devices. %package -n libgnome-bluetooth9 -License: GPLv2+ Summary: GNOME Bluetooth graphical utilities -Group: System/GUI/GNOME +Group: System/Libraries Obsoletes: libgnomebt1 <= 0.12 %description -n libgnome-bluetooth9 @@ -87,15 +78,17 @@ The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. %package -n typelib-1_0-GnomeBluetooth-1_0 -Summary: GNOME Bluetooth graphical utilities -Group: System/GUI/GNOME +Summary: GNOME Bluetooth graphical utilities -- Introspection bindings +Group: System/Libraries %description -n typelib-1_0-GnomeBluetooth-1_0 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. +This package provides the GObject Introspection bindings for the +gnome-bluetooth library. + %package plugins-geoclue -License: GPLv2+ Summary: GNOME Bluetooth Support Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -106,7 +99,6 @@ The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. %package -n nautilus-sendto-plugin-bluetooth -License: GPLv2+ Summary: Bluetooth plugin for nautilus-sendto Group: Productivity/File utilities Requires: %{name} = %{version} @@ -121,6 +113,7 @@ send files over bluetooth. %setup -q translation-update-upstream %patch0 -p1 +%patch1 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh From 21b0abf42475ce346ed112a59f2ec84ebe722d996502d411a5f4bc5199f4def7 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 23 Dec 2011 15:22:00 +0000 Subject: [PATCH 4/6] Accepting request 98040 from home:vuntz:branches:GNOME:Factory Update to 3.3.3 OBS-URL: https://build.opensuse.org/request/show/98040 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=86 --- gnome-bluetooth-3.3.2.tar.bz2 | 3 --- gnome-bluetooth-3.3.3.tar.xz | 3 +++ gnome-bluetooth.changes | 17 +++++++++++++++++ gnome-bluetooth.spec | 7 ++++--- 4 files changed, 24 insertions(+), 6 deletions(-) delete mode 100644 gnome-bluetooth-3.3.2.tar.bz2 create mode 100644 gnome-bluetooth-3.3.3.tar.xz diff --git a/gnome-bluetooth-3.3.2.tar.bz2 b/gnome-bluetooth-3.3.2.tar.bz2 deleted file mode 100644 index 4926e76..0000000 --- a/gnome-bluetooth-3.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58c21d26781729ed5b4e80e985f6f37b94af7fb830b525642046750537d16c57 -size 1394849 diff --git a/gnome-bluetooth-3.3.3.tar.xz b/gnome-bluetooth-3.3.3.tar.xz new file mode 100644 index 0000000..3b175aa --- /dev/null +++ b/gnome-bluetooth-3.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0942001164734123ca9fa870955c2455b8f1ef0a0f30f476d8c7e52164c2567 +size 1155420 diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 0bcbe40..b203327 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Dec 23 11:08:36 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Library: + - GVariant fixes + - Build improvements + + Applet: + - Fix a packing issue + + Wizard: + - Improvements in the handling of PIN codes + - Fix a segfault + - Fix an UI issue with the "Close" button +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. + ------------------------------------------------------------------- Wed Dec 21 01:17:36 UTC 2011 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index c18374a..da68527 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -15,15 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: gnome-bluetooth -Version: 3.3.2 +Version: 3.3.3 Release: 0 Summary: GNOME Bluetooth graphical utilities License: GPL-2.0+ Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeBluetooth -Source: http://download.gnome.org/sources/gnome-bluetooth/3.3/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gnome-bluetooth/3.3/%{name}-%{version}.tar.xz Source1: 61-gnome-bluetooth-rfkill.rules # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch @@ -37,6 +36,8 @@ BuildRequires: libnotify-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(gtk+-3.0) >= 2.90.7 +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(nautilus-sendto) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common From 8a194c1b4929a7d638c0b78b824bdbc5e7576efc60718a0c768a5e90126eb67e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 27 Dec 2011 20:54:59 +0000 Subject: [PATCH 5/6] Accepting request 98099 from home:Gankov:branches:GNOME:Factory Add require gnome-control-center for bluetooth-properties to work OBS-URL: https://build.opensuse.org/request/show/98099 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=87 --- gnome-bluetooth.changes | 6 ++++++ gnome-bluetooth.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index b203327..e6c7e63 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 24 13:43:44 UTC 2011 - gankov@opensuse.org + +- Add require gnome-control-center for bluetooth-properties to work + (bnc#732689) + ------------------------------------------------------------------- Fri Dec 23 11:08:36 UTC 2011 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index da68527..638c7af 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -47,6 +47,8 @@ BuildRequires: gtk-doc Requires: bluez >= 4.36 # Require obexd for bluetooth-sendto to work (bnc#622946) Requires: obexd-client +# Require gnome-control-center for bluetooth-properties to work (bnc#732689) +Requires: gnome-control-center Recommends: %{name}-lang Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 From a83f1f24a92ad4835db113da377aca1ed8a6c32ac7ec6188a4ad840e905e87d9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 5 Jan 2012 09:33:31 +0000 Subject: [PATCH 6/6] Accepting request 98841 from home:vuntz:branches:GNOME:Factory tweak OBS-URL: https://build.opensuse.org/request/show/98841 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=88 --- gnome-bluetooth.changes | 2 +- gnome-bluetooth.spec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index e6c7e63..aba94b6 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Dec 24 13:43:44 UTC 2011 - gankov@opensuse.org -- Add require gnome-control-center for bluetooth-properties to work +- Add gnome-control-center Requires for bluetooth setup to work (bnc#732689) ------------------------------------------------------------------- diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 638c7af..ec963c6 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-bluetooth # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gnome-bluetooth Version: 3.3.3 Release: 0 @@ -47,7 +48,7 @@ BuildRequires: gtk-doc Requires: bluez >= 4.36 # Require obexd for bluetooth-sendto to work (bnc#622946) Requires: obexd-client -# Require gnome-control-center for bluetooth-properties to work (bnc#732689) +# Require gnome-control-center for bluetooth setup to work (bnc#732689) Requires: gnome-control-center Recommends: %{name}-lang Provides: bluez-gnome = 1.8