Accepting request 45065 from GNOME:Factory

Copy from GNOME:Factory/gnome-bluetooth based on submit request 45065 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/45065
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-bluetooth?expand=0&rev=32

gnome-bluetooth-2.30.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4
-size 1015602

gnome-bluetooth-2.31.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:050c7f18b9a7640355f4d58f063f943fe2d79bac792bca1752bf186f70a11672
+size 1214926

gnome-bluetooth.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Aug  6 11:18:41 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.31.6:
+  + Allow setting up devices that do not use pairing
+  + Port to GSettings instead of GConf
+  + Properties:
+    - Add specific page when the only adapter is hard blocked
+      through a physical killswitch
+- Remove --disable-schemas-install from configure call
+  (gconf-specific) and update packaging to handle GSettings schemas
+  instead of gconf schemas.
+- Rename libgnome-bluetooth7 to libgnome-bluetooth8 after bump in
+  library soname.
+
+-------------------------------------------------------------------
+Tue Aug  3 19:43:52 UTC 2010 - dimstar@opensuse.org
+
+- Require bluez and obexd, fixes bnc#622946.
+
+-------------------------------------------------------------------
+Mon Jun 21 12:10:58 CEST 2010 - vuntz@opensuse.org
+
+- Revert previous change about adding HardwareSettings category to
+  bluetooth-properties.desktop, post-11.3.
+
 -------------------------------------------------------------------
 Mon Jun 21 12:09:37 CEST 2010 - vuntz@opensuse.org
 

gnome-bluetooth.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-bluetooth (Version 2.30.0)
+# spec file for package gnome-bluetooth (Version 2.31.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,11 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           gnome-bluetooth
+Version:        2.31.6
+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/2.27/gnome-bluetooth-%{version}.tar.bz2
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Patch0:         lxde-support.patch
 BuildRequires:  fdupes
+# Needed for geoclue plugin
 BuildRequires:  gconf2-devel
 BuildRequires:  gir-repository
 BuildRequires:  gnome-doc-utils-devel
@@ -30,19 +39,15 @@ BuildRequires:  libunique-devel
 BuildRequires:  nautilus-sendto-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-License:        GPLv2+
+Requires:       %{name}-lang = %{version}
-Group:          System/GUI/GNOME
+# Require bluez (mandatory, as per readme, bnc#622946)
-Version:        2.30.0
+Requires:       bluez >= 4.36
-Release:        3
+# Require obexd for bluetooth-sendto to work (bnc#622946)
-Summary:        GNOME Bluetooth graphical utilities
+Requires:       obexd
-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}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
 
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
@@ -52,7 +57,8 @@ monitor and use Bluetooth devices.
 License:        GPLv2+
 Summary:        GNOME Bluetooth Support
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version} gtk2-devel
+Requires:       %{name} = %{version}
+Requires:       gtk2-devel
 Obsoletes:      libgnomebt-devel < 0.12
 Provides:       libgnomebt-devel = 0.12
 
@@ -66,13 +72,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-bluetooth7
+%package -n libgnome-bluetooth8
 License:        GPLv2+
 Summary:        GNOME Bluetooth graphical utilities
 Group:          System/GUI/GNOME
 Obsoletes:      libgnomebt1 <= 0.12
 
-%description -n libgnome-bluetooth7
+%description -n libgnome-bluetooth8
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
 
@@ -104,12 +110,12 @@ translation-update-upstream
 %patch0 -p1
 
 %build
-%configure	--disable-schemas-install \
+%configure      \
 		--disable-icon-update \
 		--disable-scrollkeeper \
 		--disable-desktop-update \
                 --enable-introspection
-%__make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -117,33 +123,40 @@ translation-update-upstream
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 find %{buildroot} -type f -name "*.la" -delete -print
-%suse_update_desktop_file -G "Configure Bluetooth settings" -N "Bluetooth Properties" bluetooth-properties HardwareSettings
+%suse_update_desktop_file -G "Configure Bluetooth settings" -N "Bluetooth Properties" bluetooth-properties
 %suse_update_desktop_file -G "Bluetooth Manager applet" bluetooth-applet
 %find_lang %{name}2
 %find_lang %{name} %{name}2.lang
-%find_gconf_schemas
+%fdupes %{buildroot}
-%fdupes $RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%pre -f %{name}.schemas_pre
+%post
+%glib2_gsettings_schema_post
 
-%posttrans -f %{name}.schemas_posttrans
+%postun
+%glib2_gsettings_schema_postun
 
-%preun -f %{name}.schemas_preun
+%post -n nautilus-sendto-plugin-bluetooth
+%glib2_gsettings_schema_post
 
-%post -n libgnome-bluetooth7 -p /sbin/ldconfig
+%postun -n nautilus-sendto-plugin-bluetooth
+%glib2_gsettings_schema_postun
 
-%postun -n libgnome-bluetooth7 -p /sbin/ldconfig
+%post -n libgnome-bluetooth8 -p /sbin/ldconfig
 
-%files -f %{name}.schemas_list
+%postun -n libgnome-bluetooth8 -p /sbin/ldconfig
+
+%files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/bluetooth-*
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 %{_datadir}/applications/bluetooth-properties.desktop
-%{_datadir}/gnome-bluetooth
+%{_datadir}/GConf/gsettings/gnome-bluetooth
+%{_datadir}/glib-2.0/schemas/org.gnome.Bluetooth.gschema.xml
+%{_datadir}/gnome-bluetooth/
 %{_datadir}/icons/hicolor/*/*/bluetooth*
 %{_mandir}/man1/bluetooth-*
 # Own the plugin directory, but exclude the plugin library itself
@@ -154,7 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files lang -f %{name}2.lang
 
-%files -n libgnome-bluetooth7
+%files -n libgnome-bluetooth8
 %defattr(-,root,root,-)
 %{_libdir}/libgnome-bluetooth.so.*
 %{_libdir}/girepository-1.0/*.typelib
@@ -173,6 +186,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n nautilus-sendto-plugin-bluetooth
 %defattr(-,root,root,-)
+%{_datadir}/GConf/gsettings/gnome-bluetooth-nst
+%{_datadir}/glib-2.0/schemas/org.gnome.Bluetooth.nst.gschema.xml
 %{_libdir}/nautilus-sendto/plugins/libnstbluetooth.so
 
 %changelog