Accepting request 25817 from GNOME:Factory

Copy from GNOME:Factory/gnome-bluetooth based on submit request 25817 from user vuntz OBS-URL: https://build.opensuse.org/request/show/25817 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-bluetooth?expand=0&rev=23
2009-12-08 09:33:43 +00:00 · 2009-12-08 09:33:43 +00:00 · cef670c282
commit cef670c282
parent 2f5c5040c6
6 changed files with 129 additions and 14 deletions
--- a/gnome-bluetooth-2.28.1.tar.bz2
+++ b/gnome-bluetooth-2.28.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17516d4004984f43a26c8fcb763d045b045a2d02ebf843536db3af74ff90c569
-size 895561
--- a/gnome-bluetooth-2.29.3.tar.bz2
+++ 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
--- a/gnome-bluetooth-introspection-install.patch
+++ 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 \
--- a/gnome-bluetooth.changes
+++ b/gnome-bluetooth.changes
@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+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

--- 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,27 @@
 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
+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 +52,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 +70,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 +80,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 +89,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 +161,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 +175,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
--- a/lxde-support.patch
+++ 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