diff --git a/gnome-bluetooth-2.32.0.tar.bz2 b/gnome-bluetooth-2.32.0.tar.bz2 deleted file mode 100644 index 2cde0db..0000000 --- a/gnome-bluetooth-2.32.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 -size 1231205 diff --git a/gnome-bluetooth-3.0.0.tar.bz2 b/gnome-bluetooth-3.0.0.tar.bz2 new file mode 100644 index 0000000..89348a6 --- /dev/null +++ b/gnome-bluetooth-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdfa7986b8b7f622b48a70b29a48016482190d240de499da5d7fddb48ed4c211 +size 1328145 diff --git a/gnome-bluetooth-3.0.patch b/gnome-bluetooth-3.0.patch new file mode 100644 index 0000000..e0f3697 --- /dev/null +++ b/gnome-bluetooth-3.0.patch @@ -0,0 +1,25 @@ +From 16f8f60dc745f1d6dddfde031fd777959da8a226 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 21 Feb 2011 15:27:03 +0000 +Subject: [PATCH] sendto: Re-enable sendto plugin for 3.0 + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index eef6346..be8fcb7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,7 +77,7 @@ GLIB_REQUIRED=2.25.7 + DBUS_GLIB_REQUIRED=0.74 + NOTIFY_REQUIRED=0.7.0 + NAUTILUS_SENDTO_REQUIRED=2.29.0 +-NAUTILUS_SENDTO_MAX_REQUIRED=2.91.0 ++NAUTILUS_SENDTO_MAX_REQUIRED=3.1.0 + + dnl Requires for the properties window + PANELS_DIR="${libdir}/control-center-1/panels" +-- +1.7.1 + diff --git a/gnome-bluetooth-fix-introspection-build.patch b/gnome-bluetooth-fix-introspection-build.patch deleted file mode 100644 index 78bf7a9..0000000 --- a/gnome-bluetooth-fix-introspection-build.patch +++ /dev/null @@ -1,205 +0,0 @@ -commit c07d2f7fd6c38deda7b827902e62c507e55ac300 -Author: Vincent Untz -Date: Fri Oct 1 18:05:03 2010 +0200 - - Fix introspection build - - https://bugzilla.gnome.org/show_bug.cgi?id=630024 - -diff --git a/Makefile.am b/Makefile.am -index 9391392..f73baf4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help - DIST_SUBDIRS = $(DEF_SUBDIRS) moblin - EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make - --# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675 - DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ - --disable-desktop-update --disable-mime-update --disable-icon-update \ -- --enable-gtk-doc --disable-scrollkeeper --enable-introspection=no -+ --enable-gtk-doc --disable-scrollkeeper --enable-introspection - - DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make - -diff --git a/acinclude.m4 b/acinclude.m4 -index 5cf8c03..deebd2b 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1,93 +1,3 @@ --dnl -*- mode: autoconf -*- --dnl Copyright 2009 Johan Dahlin --dnl --dnl This file is free software; the author(s) gives unlimited --dnl permission to copy and/or distribute it, with or without --dnl modifications, as long as this notice is preserved. --dnl -- --# serial 1 -- --m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], --[ -- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -- -- dnl enable/disable introspection -- m4_if([$2], [require], -- [dnl -- enable_introspection=yes -- ],[dnl -- AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [Enable introspection for this build]),, -- [enable_introspection=auto]) -- ])dnl -- -- AC_MSG_CHECKING([for gobject-introspection]) -- -- dnl presence/version checking -- AS_CASE([$enable_introspection], -- [no], [dnl -- found_introspection="no (disabled, use --enable-introspection to enable)" -- ],dnl -- [yes],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -- ],dnl -- [auto],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -- ],dnl -- [dnl -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -- ])dnl -- -- AC_MSG_RESULT([$found_introspection]) -- -- INTROSPECTION_SCANNER= -- INTROSPECTION_COMPILER= -- INTROSPECTION_GENERATE= -- INTROSPECTION_GIRDIR= -- INTROSPECTION_TYPELIBDIR= -- if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- fi -- AC_SUBST(INTROSPECTION_SCANNER) -- AC_SUBST(INTROSPECTION_COMPILER) -- AC_SUBST(INTROSPECTION_GENERATE) -- AC_SUBST(INTROSPECTION_GIRDIR) -- AC_SUBST(INTROSPECTION_TYPELIBDIR) -- -- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") --]) -- -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -- --AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) --]) -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -- -- --AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) --]) -- -- - dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- - dnl autostars m4 macro for expanding directories using configure's prefix - -diff --git a/configure.ac b/configure.ac -index 8bbce4e..02aaf5f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL) - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - AC_SUBST(GLIB_GENMARSHAL) - --GOBJECT_INTROSPECTION_CHECK([0.6.3]) -+GOBJECT_INTROSPECTION_CHECK([0.6.7]) - - GNOME_COMMON_INIT - GNOME_DEBUG_CHECK -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6da2a9c..d0bc250 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -55,41 +55,27 @@ gnomebluetooth_HEADERS = \ - - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" - -+-include $(INTROSPECTION_MAKEFILE) -+INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -+ - if HAVE_INTROSPECTION --BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir -+introspection_sources = $(gnomebluetooth_HEADERS) - --GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) --GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) - GnomeBluetooth-1.0.gir: libgnome-bluetooth.la --GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) -- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ -- --add-include-path=$(srcdir) --add-include-path=. \ -- --include=GObject-2.0 \ -- --include=Gtk-2.0 \ -- --include=DBusGLib-1.0 \ -- --include=GModule-2.0 \ -- --libtool="$(LIBTOOL)" \ -- --library=gnome-bluetooth \ -- --output $@ \ -- --pkg gobject-2.0 \ -- --pkg gtk+-2.0 \ -- --pkg dbus-glib-1 \ -- --pkg gmodule-2.0 \ -- -I$(srcdir) \ -- $(LIBGNOMEBT_CFLAGS) \ -- $(gnomebluetooth_HEADERS) -+GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 -+GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) -+GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la -+GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 -+GnomeBluetooth_1_0_gir_FILES = $(introspection_sources) -+INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir - - girdir = $(INTROSPECTION_GIRDIR) --dist_gir_DATA = $(BUILT_GIRSOURCES) -- --EXTRA_DIST += $(BUILT_GIRSOURCES) -- --typelibsdir = $(INTROSPECTION_TYPELIBDIR) --typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -+gir_DATA = $(INTROSPECTION_GIRS) - --%.typelib: %.gir $(G_IR_COMPILER) -- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ -- -+typelibdir = $(INTROSPECTION_TYPELIBDIR) -+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - endif # HAVE_INTROSPECTION - - BUILT_SOURCES = marshal.h marshal.c \ -@@ -101,7 +87,7 @@ BUILT_SOURCES = marshal.h marshal.c \ - - nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) - --CLEANFILES = $(BUILT_SOURCES) -+CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) - - noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class - diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 0a81314..59fca33 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,95 @@ +------------------------------------------------------------------- +Mon Apr 4 15:28:32 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Properties: + - Show link to touchpad settings for touchpads + - Hide labels when no devices are selected + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 29 13:58:08 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.92: + + Properties: + - Use dim labels + - Fix translation problems + - Use the inline-toolbar style + + Geoclue plugin: + - Use GSettings instead of GConf + + Wizard: + - Add Magic Trackpad quirk +- Update to version 2.91.91: + + Properties: + - Put in the control-center's Hardware category + - Redesign for GNOME 3 + + Applet: + - Only start the applet in the fallback session + + Library: + - Fix a possible warning in the button chooser + + Sendto: + - Re-enable sento plugin for GNOME 3.0 + - Make double-click select a device + - Add desktop file for nice name in the shell + - Fix packing in dialogue + + Wizard: + - Add desktop file for nice name in the shell +- Changes fromv version 2.91.5: + + Properties: + - Make dialogue parenting work for errors + + Library: + - Use BluetoothClient to track default adapter + - Don't free request_key and passkey in agent reply functions. + - Set log domain to differentiate library messages from the + lib's ones + + Applet: + - Fix crash in bluetooth_applet_create_device_from_iter() + - Fix crash when creating an agent + - Fix crash when unref'ing a DBusGMethodInvocation + - Fix crash when there's no default adapter + + Moblin: + - Fix compilation of the Moblin front-end +- Changes from version 2.91.2: + + Update command to launch Bluetooth panel + + Fix i18n in the panel + + Make test-plugins test command more useful + + Fix adapter not going powered when coming back from hard-block + + Allow setup of devices that don't support pairing + + Make sure the icon is shown/hidden when killswitch state + changes. + + Make sure all the unblocked adapters get powered on startup + + Fix visible menu item disappearing after suspend + + Make --dump-devices work again in the applet, and + fix its output for some services + + Refactor applet as a library, for use in gnome-shell + + Build fixes +- Changes from version 2.90.0: + + Port to GSettings, GTK+ 3.x and GtkApplication + + Use GBinding instead of copy/paste Seahorse code + + Plenty of killswitch bug fixes + + Applet: + - Fix browsing a device when already mounted + - Use symbolic icons + + Properties: + - Port to gnome-control-center 3.x API + - Add a specific page when Bluetooth is hard-blocked + + Moblin/MeeGo: + - Use bluetoothd backed power switch + - Some re-designs for meego +- obexd-client is needed, not obexd +- Drop gnome-bluetooth-fix-introspection-build.patch: fixed + upstream. +- Update Build Requires: + - no longer needs libunique-devel + - switch to GNOME3 : pkgconfig(dbus-glib-1), + pkgconfig(gtk+-3.0), pkgconfig(libgnome-control-center), + pkgconfig(nautilus-sendto) +- Add support for source service checkout, with %BUILD_FROM_VCS: + + Add gnome-common and gtk-doc BuildRequires. + + Add call to ./autogen.sh. + + Enforce gtk-doc html generation by passing --enable-gtk-doc to + configure. + ------------------------------------------------------------------- Fri Feb 18 14:23:34 UTC 2011 - fcrozat@novell.com diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index aed04b2..3bbdab8 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -18,8 +18,8 @@ Name: gnome-bluetooth -Version: 2.32.0 -Release: 7 +Version: 3.0.0 +Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Url: http://live.gnome.org/GnomeBluetooth @@ -28,25 +28,25 @@ Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-blu 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-introspection-build.patch bgo#630024 vuntz@opensuse.org -- Fix build with recent gobject-introspection -Patch1: gnome-bluetooth-fix-introspection-build.patch BuildRequires: fdupes -# Needed for geoclue plugin -BuildRequires: gconf2-devel -# Needed for patch1 gnome-bluetooth-fix-parallel-build.patch -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libnotify-devel -BuildRequires: libunique-devel -BuildRequires: nautilus-sendto-devel +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libgnome-control-center) +BuildRequires: pkgconfig(nautilus-sendto) BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +%if 0%{?BUILD_FROM_VCS} +BuildRequires: gnome-common +BuildRequires: gtk-doc +%endif # Require bluez (mandatory, as per readme, bnc#622946) Requires: bluez >= 4.36 # Require obexd for bluetooth-sendto to work (bnc#622946) -Requires: obexd +Requires: obexd-client Recommends: %{name}-lang Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 @@ -113,25 +113,34 @@ 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 +%endif %build -NOCONFIGURE=1 gnome-autogen.sh %configure \ - --disable-icon-update \ - --disable-scrollkeeper \ - --disable-desktop-update \ - --enable-introspection -%__make %{?_smp_mflags} + --disable-icon-update \ + --disable-scrollkeeper \ + --disable-desktop-update \ +%if 0%{?BUILD_FROM_VCS} + --enable-gtk-doc \ +%endif + --enable-nautilus-sendto=yes\ + --enable-introspection +%__make %{?_smp_mflags} V=1 %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif -find %{buildroot} -type f -name "*.la" -delete -print +# 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 %suse_update_desktop_file bluetooth-properties %suse_update_desktop_file bluetooth-applet +%suse_update_desktop_file bluetooth-sendto +%suse_update_desktop_file bluetooth-wizard %find_lang %{name}2 %{?no_lang_C} %find_lang %{name} %{?no_lang_C} %{name}2.lang install -m0644 -D %{SOURCE1} %{buildroot}/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules @@ -162,7 +171,7 @@ rm -rf %{buildroot} %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING NEWS README %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/%{name}/ @@ -172,15 +181,18 @@ rm -rf %{buildroot} %doc %{_datadir}/omf/%{name}/%{name}-C.omf /lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules %{_bindir}/bluetooth-* +%{_libdir}/control-center-1/panels/libbluetooth.so %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop %{_datadir}/applications/bluetooth-properties.desktop -%{_datadir}/GConf/gsettings/gnome-bluetooth -%{_datadir}/glib-2.0/schemas/org.gnome.Bluetooth.gschema.xml +%{_datadir}/applications/bluetooth-wizard.desktop +%{_datadir}/applications/bluetooth-sendto.desktop %{_datadir}/gnome-bluetooth/ %{_datadir}/icons/hicolor/*/*/bluetooth* %{_mandir}/man1/bluetooth-* # Own the plugin directory, but exclude the plugin library itself %dir %{_libdir}/gnome-bluetooth +%{_libdir}/gnome-bluetooth/libgnome-bluetooth-applet.* +%{_libdir}/gnome-bluetooth/GnomeBluetoothApplet-1.0.typelib %dir %{_libdir}/gnome-bluetooth/plugins # Exclude files which are in another package %exclude %{_libdir}/gnome-bluetooth/plugins/libgbtgeoclue.so