From 3cb4bf68d5027f51bb802ac37235a33c3fe0c843dce295aa0324cd3d0ee005cc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Nov 2009 12:07:24 +0000 Subject: [PATCH 1/8] Accepting request 23069 from home:anubisg1:branches:GNOME:Factory Copy from home:anubisg1:branches:GNOME:Factory/gnome-bluetooth via accept of submit request 23069 revision 2. Request was accepted with message: Accepted it, but for future references, please do not use \t in the preamble of the spec file. OBS-URL: https://build.opensuse.org/request/show/23069 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=28 --- gnome-bluetooth.changes | 5 +++++ gnome-bluetooth.spec | 2 ++ lxde-support.patch | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 lxde-support.patch diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index e1b63a5..eac53ad 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 24 18:18:53 UTC 2009 - andrea@opensuse.org + +- added LXDE support to /etc/xdg/autostart/bluetooth-applet.desktop + ------------------------------------------------------------------- Tue Sep 29 10:01:20 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 55e501d..7548d7a 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -40,6 +40,7 @@ Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 +Patch0: lxde-support.patch Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 Requires: %{name}-lang = %{version} @@ -90,6 +91,7 @@ monitor and use Bluetooth devices. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build diff --git a/lxde-support.patch b/lxde-support.patch new file mode 100644 index 0000000..240b995 --- /dev/null +++ b/lxde-support.patch @@ -0,0 +1,12 @@ +diff -uNr old-gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in +--- old-gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in 2009-10-24 20:17:17.854254851 +0200 ++++ gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in 2009-10-24 20:17:32.070257115 +0200 +@@ -6,7 +6,7 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME;XFCE; ++OnlyShowIn=GNOME;XFCE;LXDE; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-bluetooth + X-GNOME-Bugzilla-Component=applet From 9d7c8fb70130ce4cd8a1745a758d60839d2182d99b05cdbb90e154d5fcd0a186 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Nov 2009 12:09:01 +0000 Subject: [PATCH 2/8] Accepting request 25045 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/gnome-bluetooth via accept of submit request 25045 revision 2. Request was accepted with message: I guess I do OBS-URL: https://build.opensuse.org/request/show/25045 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=29 --- gnome-bluetooth.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 7548d7a..09256f9 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -40,7 +40,7 @@ Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 -Patch0: lxde-support.patch +Patch0: lxde-support.patch Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 Requires: %{name}-lang = %{version} From 2122f7d3426b0622d053edc9c0f180e2ceff6a52107a76a828b8e199692166e0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 4 Dec 2009 03:02:06 +0000 Subject: [PATCH 3/8] Accepting request 25512 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-bluetooth via accept of submit request 25512 revision 8. Request was accepted with message: accepting OBS-URL: https://build.opensuse.org/request/show/25512 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=30 --- gnome-bluetooth-2.28.1.tar.bz2 | 3 -- gnome-bluetooth-2.29.3.tar.bz2 | 3 ++ gnome-bluetooth-introspection-install.patch | 35 ++++++++++++++++++ gnome-bluetooth.changes | 40 ++++++++++++++++++++- gnome-bluetooth.spec | 40 ++++++++++++++++----- 5 files changed, 109 insertions(+), 12 deletions(-) delete mode 100644 gnome-bluetooth-2.28.1.tar.bz2 create mode 100644 gnome-bluetooth-2.29.3.tar.bz2 create mode 100644 gnome-bluetooth-introspection-install.patch diff --git a/gnome-bluetooth-2.28.1.tar.bz2 b/gnome-bluetooth-2.28.1.tar.bz2 deleted file mode 100644 index d83b6f0..0000000 --- a/gnome-bluetooth-2.28.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17516d4004984f43a26c8fcb763d045b045a2d02ebf843536db3af74ff90c569 -size 895561 diff --git a/gnome-bluetooth-2.29.3.tar.bz2 b/gnome-bluetooth-2.29.3.tar.bz2 new file mode 100644 index 0000000..56434ef --- /dev/null +++ b/gnome-bluetooth-2.29.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:075d6a2db4fe0f54df35d3b2a69fe56641dabae4ecf4fa1a1dc7b2a49411998e +size 994944 diff --git a/gnome-bluetooth-introspection-install.patch b/gnome-bluetooth-introspection-install.patch new file mode 100644 index 0000000..3ef8a02 --- /dev/null +++ b/gnome-bluetooth-introspection-install.patch @@ -0,0 +1,35 @@ +Index: gnome-bluetooth-2.29.3/lib/Makefile.am +=================================================================== +--- gnome-bluetooth-2.29.3.orig/lib/Makefile.am ++++ gnome-bluetooth-2.29.3/lib/Makefile.am +@@ -82,12 +82,12 @@ GnomeBluetooth-1.0.gir: $(INTROSPECTION_ + $(LIBGNOMEBT_CFLAGS) \ + $(gnomebluetooth_HEADERS) + +-girdir = $(GIRDIR) ++girdir = $(INTROSPECTION_GIRDIR) + dist_gir_DATA = $(BUILT_GIRSOURCES) + + EXTRA_DIST += $(BUILT_GIRSOURCES) + +-typelibsdir = $(TYPELIBDIR) ++typelibsdir = $(INTROSPECTION_TYPELIBDIR) + typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + + %.typelib: %.gir $(G_IR_COMPILER) +Index: gnome-bluetooth-2.29.3/lib/Makefile.in +=================================================================== +--- gnome-bluetooth-2.29.3.orig/lib/Makefile.in ++++ gnome-bluetooth-2.29.3/lib/Makefile.in +@@ -433,9 +433,9 @@ gnomebluetooth_HEADERS = \ + bluetooth-plugin.h + + AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" +-@HAVE_INTROSPECTION_TRUE@girdir = $(GIRDIR) ++@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR) + @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES) +-@HAVE_INTROSPECTION_TRUE@typelibsdir = $(TYPELIBDIR) ++@HAVE_INTROSPECTION_TRUE@typelibsdir = $(INTROSPECTION_TYPELIBDIR) + @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + BUILT_SOURCES = marshal.h marshal.c \ + bluetooth-client-glue.h \ diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index eac53ad..78bdb05 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,7 +1,45 @@ +------------------------------------------------------------------- +Thu Dec 3 11:07:48 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.3: + + Build and install nautilus-sendto plugin by default + + Preferences: + - Add a button to access "Personal File Sharing" preferences + + Library: + - Clean up combo box selection widget + - Make it possible to set the selected device in the chooser + - Make the button chooser select the device when popping up a + dialogue + + Sendto: + - Wrap errors instead of clipping them + + Wizard: + - Make it possible to re-pair devices +- Changes from version 2.29.2: + + Add Moblin front-end for gnome-bluetooth + + Add experimental nautilus-sendto plugin + + Applet: + - Fix applet showing the wrong connection information + - Use separate icon for the status icon, for monochromatic + themes + - Add discoverable menu item + - Fix a number of rfkill related bugs + + Library: + - Make it possible use another widget for device filtering + - Don't overwrite UUIDs when discovering known devices + - Add BluetoothChooserCombo widget + - Fix usage under non-UTF-8 locales +- Add nautilus-sendto-devel BuildRequires and create + nautilus-sendto-plugin-bluetooth subpackage. +- Enable introspection: add gir-repository and + gobject-introspection-devel BuildRequires, pass + --enable-introspection to configure. +- Add gnome-bluetooth-introspection-install.patch to fix + installation of introspection data. + ------------------------------------------------------------------- Sat Oct 24 18:18:53 UTC 2009 - andrea@opensuse.org -- added LXDE support to /etc/xdg/autostart/bluetooth-applet.desktop +- added LXDE support to /etc/xdg/autostart/bluetooth-applet.desktop ------------------------------------------------------------------- Tue Sep 29 10:01:20 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 09256f9..7f1a264 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.28.1) +# spec file for package gnome-bluetooth (Version 2.29.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,26 +21,28 @@ Name: gnome-bluetooth BuildRequires: fdupes BuildRequires: gconf2-devel -# FIXME: fails to build with it as of 2.27.8 -# BuildRequires: gir-repository +BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel -# FIXME: fails to build with it as of 2.27.8 -# BuildRequires: gobject-introspection-devel +BuildRequires: gobject-introspection-devel BuildRequires: hal-devel BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: libunique-devel +BuildRequires: nautilus-sendto-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.28.1 +Version: 2.29.3 +# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 Patch0: lxde-support.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-introspection-install.patch bgo603704 vuntz@opensuse.org -- Fix introspection data installation +Patch1: gnome-bluetooth-introspection-install.patch Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 Requires: %{name}-lang = %{version} @@ -88,21 +90,37 @@ Requires: %{name} = %{version} The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. +%package -n nautilus-sendto-plugin-bluetooth +License: GPL v2 or later +Summary: Bluetooth plugin for nautilus-sendto +Group: Productivity/File utilities +Requires: %{name} = %{version} +Supplements: packageand{%{name}:nautilus-sendto} + +%description -n nautilus-sendto-plugin-bluetooth +This package provides the functionality to the Nautilus file browser to +send files over bluetooth. + %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream +%patch0 -p1 +%patch1 -p1 %build %configure --disable-schemas-install \ --disable-icon-update \ --disable-scrollkeeper \ - --disable-desktop-update + --disable-desktop-update \ + --enable-introspection %__make %{?jobs:-j%jobs} %install %makeinstall +# %if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +# %endif find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file bluetooth-properties -G "Configure Bluetooth settings" -N "Bluetooth Properties" %suse_update_desktop_file bluetooth-applet -G "Bluetooth Manager applet" @@ -144,6 +162,8 @@ rm -rf $RPM_BUILD_ROOT %files -n libgnome-bluetooth7 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* +%{_libdir}/girepository-1.0/*.typelib +%{_datadir}/gir-1.0/*.gir %files devel %defattr(-, root, root) @@ -156,4 +176,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/gnome-bluetooth/plugins/libgbtgeoclue.so +%files -n nautilus-sendto-plugin-bluetooth +%defattr(-,root,root,-) +%{_libdir}/nautilus-sendto/plugins/libnstbluetooth.so + %changelog From f9a5bf143c8d36482663024e4d94caddeb292fb4fb4fc4fe041b5ea1b25f0c93 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 7 Dec 2009 13:37:22 +0000 Subject: [PATCH 4/8] en@shaw OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=31 --- gnome-bluetooth.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 7f1a264..f5f4e5c 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -34,7 +34,6 @@ BuildRequires: update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME Version: 2.29.3 -# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory Release: 1 Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ @@ -118,9 +117,9 @@ translation-update-upstream %install %makeinstall -# %if 0%{?suse_version} <= 1120 +%if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -# %endif +%endif find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file bluetooth-properties -G "Configure Bluetooth settings" -N "Bluetooth Properties" %suse_update_desktop_file bluetooth-applet -G "Bluetooth Manager applet" From c532a92c5a3e29ccd88e30997277f1f8c076361cce13862f0ebd1e3e6a1b2b5b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 09:33:42 +0000 Subject: [PATCH 5/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=32 --- gnome-bluetooth-2.28.1.tar.bz2 | 3 ++ gnome-bluetooth-2.29.3.tar.bz2 | 3 -- gnome-bluetooth-introspection-install.patch | 35 ----------------- gnome-bluetooth.changes | 43 --------------------- gnome-bluetooth.spec | 39 ++++--------------- lxde-support.patch | 12 ------ 6 files changed, 10 insertions(+), 125 deletions(-) create mode 100644 gnome-bluetooth-2.28.1.tar.bz2 delete mode 100644 gnome-bluetooth-2.29.3.tar.bz2 delete mode 100644 gnome-bluetooth-introspection-install.patch delete mode 100644 lxde-support.patch diff --git a/gnome-bluetooth-2.28.1.tar.bz2 b/gnome-bluetooth-2.28.1.tar.bz2 new file mode 100644 index 0000000..d83b6f0 --- /dev/null +++ b/gnome-bluetooth-2.28.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17516d4004984f43a26c8fcb763d045b045a2d02ebf843536db3af74ff90c569 +size 895561 diff --git a/gnome-bluetooth-2.29.3.tar.bz2 b/gnome-bluetooth-2.29.3.tar.bz2 deleted file mode 100644 index 56434ef..0000000 --- a/gnome-bluetooth-2.29.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:075d6a2db4fe0f54df35d3b2a69fe56641dabae4ecf4fa1a1dc7b2a49411998e -size 994944 diff --git a/gnome-bluetooth-introspection-install.patch b/gnome-bluetooth-introspection-install.patch deleted file mode 100644 index 3ef8a02..0000000 --- a/gnome-bluetooth-introspection-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: gnome-bluetooth-2.29.3/lib/Makefile.am -=================================================================== ---- gnome-bluetooth-2.29.3.orig/lib/Makefile.am -+++ gnome-bluetooth-2.29.3/lib/Makefile.am -@@ -82,12 +82,12 @@ GnomeBluetooth-1.0.gir: $(INTROSPECTION_ - $(LIBGNOMEBT_CFLAGS) \ - $(gnomebluetooth_HEADERS) - --girdir = $(GIRDIR) -+girdir = $(INTROSPECTION_GIRDIR) - dist_gir_DATA = $(BUILT_GIRSOURCES) - - EXTRA_DIST += $(BUILT_GIRSOURCES) - --typelibsdir = $(TYPELIBDIR) -+typelibsdir = $(INTROSPECTION_TYPELIBDIR) - typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) - - %.typelib: %.gir $(G_IR_COMPILER) -Index: gnome-bluetooth-2.29.3/lib/Makefile.in -=================================================================== ---- gnome-bluetooth-2.29.3.orig/lib/Makefile.in -+++ gnome-bluetooth-2.29.3/lib/Makefile.in -@@ -433,9 +433,9 @@ gnomebluetooth_HEADERS = \ - bluetooth-plugin.h - - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" --@HAVE_INTROSPECTION_TRUE@girdir = $(GIRDIR) -+@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR) - @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES) --@HAVE_INTROSPECTION_TRUE@typelibsdir = $(TYPELIBDIR) -+@HAVE_INTROSPECTION_TRUE@typelibsdir = $(INTROSPECTION_TYPELIBDIR) - @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) - BUILT_SOURCES = marshal.h marshal.c \ - bluetooth-client-glue.h \ diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 78bdb05..e1b63a5 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,46 +1,3 @@ -------------------------------------------------------------------- -Thu Dec 3 11:07:48 CET 2009 - vuntz@opensuse.org - -- Update to version 2.29.3: - + Build and install nautilus-sendto plugin by default - + Preferences: - - Add a button to access "Personal File Sharing" preferences - + Library: - - Clean up combo box selection widget - - Make it possible to set the selected device in the chooser - - Make the button chooser select the device when popping up a - dialogue - + Sendto: - - Wrap errors instead of clipping them - + Wizard: - - Make it possible to re-pair devices -- Changes from version 2.29.2: - + Add Moblin front-end for gnome-bluetooth - + Add experimental nautilus-sendto plugin - + Applet: - - Fix applet showing the wrong connection information - - Use separate icon for the status icon, for monochromatic - themes - - Add discoverable menu item - - Fix a number of rfkill related bugs - + Library: - - Make it possible use another widget for device filtering - - Don't overwrite UUIDs when discovering known devices - - Add BluetoothChooserCombo widget - - Fix usage under non-UTF-8 locales -- Add nautilus-sendto-devel BuildRequires and create - nautilus-sendto-plugin-bluetooth subpackage. -- Enable introspection: add gir-repository and - gobject-introspection-devel BuildRequires, pass - --enable-introspection to configure. -- Add gnome-bluetooth-introspection-install.patch to fix - installation of introspection data. - -------------------------------------------------------------------- -Sat Oct 24 18:18:53 UTC 2009 - andrea@opensuse.org - -- added LXDE support to /etc/xdg/autostart/bluetooth-applet.desktop - ------------------------------------------------------------------- Tue Sep 29 10:01:20 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index f5f4e5c..55e501d 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.29.3) +# spec file for package gnome-bluetooth (Version 2.28.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,27 +21,25 @@ Name: gnome-bluetooth BuildRequires: fdupes BuildRequires: gconf2-devel -BuildRequires: gir-repository +# FIXME: fails to build with it as of 2.27.8 +# BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel -BuildRequires: gobject-introspection-devel +# FIXME: fails to build with it as of 2.27.8 +# BuildRequires: gobject-introspection-devel BuildRequires: hal-devel BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: libunique-devel -BuildRequires: nautilus-sendto-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.29.3 +Version: 2.28.1 Release: 1 Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 -Patch0: lxde-support.patch -# PATCH-FIX-UPSTREAM gnome-bluetooth-introspection-install.patch bgo603704 vuntz@opensuse.org -- Fix introspection data installation -Patch1: gnome-bluetooth-introspection-install.patch Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 Requires: %{name}-lang = %{version} @@ -89,37 +87,20 @@ Requires: %{name} = %{version} The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. -%package -n nautilus-sendto-plugin-bluetooth -License: GPL v2 or later -Summary: Bluetooth plugin for nautilus-sendto -Group: Productivity/File utilities -Requires: %{name} = %{version} -Supplements: packageand{%{name}:nautilus-sendto} - -%description -n nautilus-sendto-plugin-bluetooth -This package provides the functionality to the Nautilus file browser to -send files over bluetooth. - %lang_package %prep %setup -q translation-update-upstream -%patch0 -p1 -%patch1 -p1 %build %configure --disable-schemas-install \ --disable-icon-update \ --disable-scrollkeeper \ - --disable-desktop-update \ - --enable-introspection + --disable-desktop-update %__make %{?jobs:-j%jobs} %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file bluetooth-properties -G "Configure Bluetooth settings" -N "Bluetooth Properties" %suse_update_desktop_file bluetooth-applet -G "Bluetooth Manager applet" @@ -161,8 +142,6 @@ rm -rf $RPM_BUILD_ROOT %files -n libgnome-bluetooth7 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* -%{_libdir}/girepository-1.0/*.typelib -%{_datadir}/gir-1.0/*.gir %files devel %defattr(-, root, root) @@ -175,8 +154,4 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/gnome-bluetooth/plugins/libgbtgeoclue.so -%files -n nautilus-sendto-plugin-bluetooth -%defattr(-,root,root,-) -%{_libdir}/nautilus-sendto/plugins/libnstbluetooth.so - %changelog diff --git a/lxde-support.patch b/lxde-support.patch deleted file mode 100644 index 240b995..0000000 --- a/lxde-support.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr old-gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in ---- old-gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in 2009-10-24 20:17:17.854254851 +0200 -+++ gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in 2009-10-24 20:17:32.070257115 +0200 -@@ -6,7 +6,7 @@ - Terminal=false - Type=Application - Categories= --OnlyShowIn=GNOME;XFCE; -+OnlyShowIn=GNOME;XFCE;LXDE; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gnome-bluetooth - X-GNOME-Bugzilla-Component=applet From f619d80cfed0144396dee2601f02c109e2ec44eb5232edba43144c0af883991d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Dec 2009 10:50:40 +0000 Subject: [PATCH 6/8] Accepting request 26214 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/gnome-bluetooth via accept of submit request 26214 revision 2. Request was accepted with message: Thanks OBS-URL: https://build.opensuse.org/request/show/26214 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=33 --- gnome-bluetooth-2.28.1.tar.bz2 | 3 -- gnome-bluetooth-2.29.3.tar.bz2 | 3 ++ gnome-bluetooth-introspection-install.patch | 35 +++++++++++++++ gnome-bluetooth.changes | 48 +++++++++++++++++++++ gnome-bluetooth.spec | 48 +++++++++++++++------ lxde-support.patch | 12 ++++++ 6 files changed, 134 insertions(+), 15 deletions(-) delete mode 100644 gnome-bluetooth-2.28.1.tar.bz2 create mode 100644 gnome-bluetooth-2.29.3.tar.bz2 create mode 100644 gnome-bluetooth-introspection-install.patch create mode 100644 lxde-support.patch diff --git a/gnome-bluetooth-2.28.1.tar.bz2 b/gnome-bluetooth-2.28.1.tar.bz2 deleted file mode 100644 index d83b6f0..0000000 --- a/gnome-bluetooth-2.28.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17516d4004984f43a26c8fcb763d045b045a2d02ebf843536db3af74ff90c569 -size 895561 diff --git a/gnome-bluetooth-2.29.3.tar.bz2 b/gnome-bluetooth-2.29.3.tar.bz2 new file mode 100644 index 0000000..56434ef --- /dev/null +++ b/gnome-bluetooth-2.29.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:075d6a2db4fe0f54df35d3b2a69fe56641dabae4ecf4fa1a1dc7b2a49411998e +size 994944 diff --git a/gnome-bluetooth-introspection-install.patch b/gnome-bluetooth-introspection-install.patch new file mode 100644 index 0000000..3ef8a02 --- /dev/null +++ b/gnome-bluetooth-introspection-install.patch @@ -0,0 +1,35 @@ +Index: gnome-bluetooth-2.29.3/lib/Makefile.am +=================================================================== +--- gnome-bluetooth-2.29.3.orig/lib/Makefile.am ++++ gnome-bluetooth-2.29.3/lib/Makefile.am +@@ -82,12 +82,12 @@ GnomeBluetooth-1.0.gir: $(INTROSPECTION_ + $(LIBGNOMEBT_CFLAGS) \ + $(gnomebluetooth_HEADERS) + +-girdir = $(GIRDIR) ++girdir = $(INTROSPECTION_GIRDIR) + dist_gir_DATA = $(BUILT_GIRSOURCES) + + EXTRA_DIST += $(BUILT_GIRSOURCES) + +-typelibsdir = $(TYPELIBDIR) ++typelibsdir = $(INTROSPECTION_TYPELIBDIR) + typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + + %.typelib: %.gir $(G_IR_COMPILER) +Index: gnome-bluetooth-2.29.3/lib/Makefile.in +=================================================================== +--- gnome-bluetooth-2.29.3.orig/lib/Makefile.in ++++ gnome-bluetooth-2.29.3/lib/Makefile.in +@@ -433,9 +433,9 @@ gnomebluetooth_HEADERS = \ + bluetooth-plugin.h + + AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" +-@HAVE_INTROSPECTION_TRUE@girdir = $(GIRDIR) ++@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR) + @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES) +-@HAVE_INTROSPECTION_TRUE@typelibsdir = $(TYPELIBDIR) ++@HAVE_INTROSPECTION_TRUE@typelibsdir = $(INTROSPECTION_TYPELIBDIR) + @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + BUILT_SOURCES = marshal.h marshal.c \ + bluetooth-client-glue.h \ diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index e1b63a5..a76ec2e 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Thu Dec 10 20:35:21 UTC 2009 - aj@suse.de + +- Remove unused BuildRequires hal-devel + +------------------------------------------------------------------- +Thu Dec 3 11:07:48 CET 2009 - vuntz@opensuse.org + +- Update to version 2.29.3: + + Build and install nautilus-sendto plugin by default + + Preferences: + - Add a button to access "Personal File Sharing" preferences + + Library: + - Clean up combo box selection widget + - Make it possible to set the selected device in the chooser + - Make the button chooser select the device when popping up a + dialogue + + Sendto: + - Wrap errors instead of clipping them + + Wizard: + - Make it possible to re-pair devices +- Changes from version 2.29.2: + + Add Moblin front-end for gnome-bluetooth + + Add experimental nautilus-sendto plugin + + Applet: + - Fix applet showing the wrong connection information + - Use separate icon for the status icon, for monochromatic + themes + - Add discoverable menu item + - Fix a number of rfkill related bugs + + Library: + - Make it possible use another widget for device filtering + - Don't overwrite UUIDs when discovering known devices + - Add BluetoothChooserCombo widget + - Fix usage under non-UTF-8 locales +- Add nautilus-sendto-devel BuildRequires and create + nautilus-sendto-plugin-bluetooth subpackage. +- Enable introspection: add gir-repository and + gobject-introspection-devel BuildRequires, pass + --enable-introspection to configure. +- Add gnome-bluetooth-introspection-install.patch to fix + installation of introspection data. + +------------------------------------------------------------------- +Sat Oct 24 18:18:53 UTC 2009 - andrea@opensuse.org + +- added LXDE support to /etc/xdg/autostart/bluetooth-applet.desktop + ------------------------------------------------------------------- Tue Sep 29 10:01:20 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 55e501d..78803ce 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.28.1) +# spec file for package gnome-bluetooth (Version 2.29.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,25 +21,26 @@ Name: gnome-bluetooth BuildRequires: fdupes BuildRequires: gconf2-devel -# FIXME: fails to build with it as of 2.27.8 -# BuildRequires: gir-repository +BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel -# FIXME: fails to build with it as of 2.27.8 -# BuildRequires: gobject-introspection-devel -BuildRequires: hal-devel +BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: libunique-devel +BuildRequires: nautilus-sendto-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/GNOME -Version: 2.28.1 +Version: 2.29.3 Release: 1 Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 +Patch0: lxde-support.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-introspection-install.patch bgo603704 vuntz@opensuse.org -- Fix introspection data installation +Patch1: gnome-bluetooth-introspection-install.patch Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 Requires: %{name}-lang = %{version} @@ -50,7 +51,7 @@ The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: GNOME Bluetooth Support Group: Development/Libraries/GNOME Requires: %{name} = %{version} gtk2-devel @@ -68,7 +69,7 @@ select the files you want to send and choose "Send via Bluetooth..." from the context menu. %package -n libgnome-bluetooth7 -License: GPL v2 or later +License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Group: System/GUI/GNOME Obsoletes: libgnomebt1 <= 0.12 @@ -78,7 +79,7 @@ The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. %package plugins-geoclue -License: GPL v2 or later +License: GPLv2+ Summary: GNOME Bluetooth Support Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -87,20 +88,37 @@ Requires: %{name} = %{version} 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} +Supplements: packageand{%{name}:nautilus-sendto} + +%description -n nautilus-sendto-plugin-bluetooth +This package provides the functionality to the Nautilus file browser to +send files over bluetooth. + %lang_package %prep %setup -q translation-update-upstream +%patch0 -p1 +%patch1 -p1 %build %configure --disable-schemas-install \ --disable-icon-update \ --disable-scrollkeeper \ - --disable-desktop-update + --disable-desktop-update \ + --enable-introspection %__make %{?jobs:-j%jobs} %install %makeinstall +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file bluetooth-properties -G "Configure Bluetooth settings" -N "Bluetooth Properties" %suse_update_desktop_file bluetooth-applet -G "Bluetooth Manager applet" @@ -142,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT %files -n libgnome-bluetooth7 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* +%{_libdir}/girepository-1.0/*.typelib +%{_datadir}/gir-1.0/*.gir %files devel %defattr(-, root, root) @@ -154,4 +174,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/gnome-bluetooth/plugins/libgbtgeoclue.so +%files -n nautilus-sendto-plugin-bluetooth +%defattr(-,root,root,-) +%{_libdir}/nautilus-sendto/plugins/libnstbluetooth.so + %changelog diff --git a/lxde-support.patch b/lxde-support.patch new file mode 100644 index 0000000..240b995 --- /dev/null +++ b/lxde-support.patch @@ -0,0 +1,12 @@ +diff -uNr old-gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in +--- old-gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in 2009-10-24 20:17:17.854254851 +0200 ++++ gnome-bluetooth-2.28.1/applet/bluetooth-applet.desktop.in.in 2009-10-24 20:17:32.070257115 +0200 +@@ -6,7 +6,7 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME;XFCE; ++OnlyShowIn=GNOME;XFCE;LXDE; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-bluetooth + X-GNOME-Bugzilla-Component=applet From 2cbab3e559c538d9b5e2e644baec9f7bd848f45a840f9e4aa4160a1c0dd2c1ca Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Dec 2009 12:58:05 +0000 Subject: [PATCH 7/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=34 --- gnome-bluetooth.changes | 5 ----- gnome-bluetooth.spec | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index a76ec2e..78bdb05 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Dec 10 20:35:21 UTC 2009 - aj@suse.de - -- Remove unused BuildRequires hal-devel - ------------------------------------------------------------------- Thu Dec 3 11:07:48 CET 2009 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 78803ce..b98a217 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -24,6 +24,7 @@ BuildRequires: gconf2-devel BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel +BuildRequires: hal-devel BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: libunique-devel From 4afd9cc0f7978f83ff2ad2e73f3b4a24c4d49abf1262650ca1150445768ec56b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 18 Dec 2009 12:58:06 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/gnome-bluetooth revision 24.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=1740abdf7f7a1208622fd97ba0fae947 --- gnome-bluetooth.changes | 5 +++++ gnome-bluetooth.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 78bdb05..a76ec2e 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 10 20:35:21 UTC 2009 - aj@suse.de + +- Remove unused BuildRequires hal-devel + ------------------------------------------------------------------- Thu Dec 3 11:07:48 CET 2009 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index b98a217..82a4745 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -24,7 +24,6 @@ BuildRequires: gconf2-devel BuildRequires: gir-repository BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel -BuildRequires: hal-devel BuildRequires: intltool BuildRequires: libnotify-devel BuildRequires: libunique-devel @@ -34,7 +33,7 @@ BuildRequires: update-desktop-files License: GPLv2+ Group: System/GUI/GNOME Version: 2.29.3 -Release: 1 +Release: 2 Summary: GNOME Bluetooth graphical utilities Url: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build