From 2ebe5a6f6b80633de41ac30d883621f7d9928f7d5faeaefdb29a9c7d0a33fba3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 18 Jan 2012 20:13:47 +0000 Subject: [PATCH] Accepting request 100612 from home:vuntz:branches:GNOME:Factory Update to 3.3.4 OBS-URL: https://build.opensuse.org/request/show/100612 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=91 --- gnome-bluetooth-3.3.3.tar.xz | 3 -- gnome-bluetooth-3.3.4.tar.xz | 3 ++ gnome-bluetooth-no-dbus-glib.patch | 60 ------------------------------ gnome-bluetooth.changes | 20 ++++++++++ gnome-bluetooth.spec | 16 ++++---- 5 files changed, 30 insertions(+), 72 deletions(-) delete mode 100644 gnome-bluetooth-3.3.3.tar.xz create mode 100644 gnome-bluetooth-3.3.4.tar.xz delete mode 100644 gnome-bluetooth-no-dbus-glib.patch diff --git a/gnome-bluetooth-3.3.3.tar.xz b/gnome-bluetooth-3.3.3.tar.xz deleted file mode 100644 index 3b175aa..0000000 --- a/gnome-bluetooth-3.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0942001164734123ca9fa870955c2455b8f1ef0a0f30f476d8c7e52164c2567 -size 1155420 diff --git a/gnome-bluetooth-3.3.4.tar.xz b/gnome-bluetooth-3.3.4.tar.xz new file mode 100644 index 0000000..84974b4 --- /dev/null +++ b/gnome-bluetooth-3.3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:045e4232b3adbb9219bde406c853ba8d652bb58ce7ea85323b51fc8c786abeea +size 1139280 diff --git a/gnome-bluetooth-no-dbus-glib.patch b/gnome-bluetooth-no-dbus-glib.patch deleted file mode 100644 index d4871c5..0000000 --- a/gnome-bluetooth-no-dbus-glib.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 25d8598..bfb6c89 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 18 17:46:50 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.4: + + Applet: + - Fix newly paired devices not appearing in menus + - Update fallback menu to match GNOME Shell's + + Library: + - Make the Connect/Disconnect helper function work + - Do not use dbus-glib-1 when building introspection data + - Remove header from chooser widget, breaks API + + Wizard: + - Fix assertion when exiting + - Remove "Device Setup Failed" label from the sidebar + - A number of UI tweaks + + Plus build fixes, and the removal of the unmaintained Moblin UI +- Drop gnome-bluetooth-no-dbus-glib.patch: fixed upstream. +- Rename libgnome-bluetooth9 subpackage to libgnome-bluetooth10, + following upstream soversion change. + ------------------------------------------------------------------- Wed Jan 11 08:59:36 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 8c3f443..226a189 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gnome-bluetooth -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: GNOME Bluetooth graphical utilities License: GPL-2.0+ @@ -26,8 +27,6 @@ Source: http://download.gnome.org/sources/gnome-bluetooth/3.3/%{name}-%{ 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 @@ -71,12 +70,12 @@ Provides: libgnomebt-devel = 0.12 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. -%package -n libgnome-bluetooth9 +%package -n libgnome-bluetooth10 Summary: GNOME Bluetooth graphical utilities Group: System/Libraries Obsoletes: libgnomebt1 <= 0.12 -%description -n libgnome-bluetooth9 +%description -n libgnome-bluetooth10 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. @@ -116,7 +115,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 @@ -164,9 +162,9 @@ rm -rf %{buildroot} %postun -n nautilus-sendto-plugin-bluetooth %glib2_gsettings_schema_postun -%post -n libgnome-bluetooth9 -p /sbin/ldconfig +%post -n libgnome-bluetooth10 -p /sbin/ldconfig -%postun -n libgnome-bluetooth9 -p /sbin/ldconfig +%postun -n libgnome-bluetooth10 -p /sbin/ldconfig %files %defattr(-, root, root) @@ -196,7 +194,7 @@ rm -rf %{buildroot} %files lang -f %{name}2.lang -%files -n libgnome-bluetooth9 +%files -n libgnome-bluetooth10 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.*