From cb7c77a7e22e9422ea8dc65f2a64c3da4b719f927d4c83dfdda1ed81b2decc44 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 16 Jul 2010 10:21:23 +0000 Subject: [PATCH 1/5] Accepting request 41827 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-bluetooth via accept of submit request 41827 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/41827 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=44 --- gnome-bluetooth.changes | 6 ++++++ gnome-bluetooth.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 86f82f0..e630d05 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 9887263..a9c4e0a 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -117,7 +117,7 @@ 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 From 7e431b947949fe3747d49f8d7af4b487650601081effd725b870652d24079a44 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Aug 2010 09:09:19 +0000 Subject: [PATCH 2/5] Accepting request 44681 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-bluetooth via accept of submit request 44681 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44681 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=45 --- gnome-bluetooth.changes | 5 +++++ gnome-bluetooth.spec | 35 ++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index e630d05..8c86d2d 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index a9c4e0a..8565fe8 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -15,10 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: gnome-bluetooth +Version: 2.30.0 +Release: 3 +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 BuildRequires: gconf2-devel BuildRequires: gir-repository @@ -30,18 +38,14 @@ BuildRequires: libunique-devel BuildRequires: nautilus-sendto-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -License: GPLv2+ -Group: System/GUI/GNOME -Version: 2.30.0 -Release: 3 -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 +Requires: %{name}-lang = %{version} +# Require bluez (mandatory, as per readme, bnc#622946) +Requires: bluez >= 4.36 +# Require obexd for bluetooth-sendto to work (bnc#622946) +Requires: obexd Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 -Requires: %{name}-lang = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %description @@ -52,7 +56,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 @@ -109,7 +114,7 @@ translation-update-upstream --disable-scrollkeeper \ --disable-desktop-update \ --enable-introspection -%__make %{?jobs:-j%jobs} +%__make %{?_smp_mflags} %install %makeinstall @@ -122,10 +127,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name}2 %find_lang %{name} %{name}2.lang %find_gconf_schemas -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %pre -f %{name}.schemas_pre From 528704596f77d9f94f1e3070519e8c63c5a99f69e6741f3ad932252d67d8620c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Aug 2010 09:56:58 +0000 Subject: [PATCH 3/5] Accepting request 44689 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-bluetooth via accept of submit request 44689 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44689 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=46 --- gnome-bluetooth-2.30.0.tar.bz2 | 3 --- gnome-bluetooth-2.31.6.tar.bz2 | 3 +++ gnome-bluetooth.changes | 15 ++++++++++++ gnome-bluetooth.spec | 42 +++++++++++++++++++++------------- 4 files changed, 44 insertions(+), 19 deletions(-) delete mode 100644 gnome-bluetooth-2.30.0.tar.bz2 create mode 100644 gnome-bluetooth-2.31.6.tar.bz2 diff --git a/gnome-bluetooth-2.30.0.tar.bz2 b/gnome-bluetooth-2.30.0.tar.bz2 deleted file mode 100644 index c48eba5..0000000 --- a/gnome-bluetooth-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4 -size 1015602 diff --git a/gnome-bluetooth-2.31.6.tar.bz2 b/gnome-bluetooth-2.31.6.tar.bz2 new file mode 100644 index 0000000..cab3be1 --- /dev/null +++ b/gnome-bluetooth-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:050c7f18b9a7640355f4d58f063f943fe2d79bac792bca1752bf186f70a11672 +size 1214926 diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 8c86d2d..abb2392 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 8565fe8..5cbbc00 100644 --- a/gnome-bluetooth.spec +++ b/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. # @@ -18,8 +18,8 @@ Name: gnome-bluetooth -Version: 2.30.0 -Release: 3 +Version: 2.31.6 +Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Url: http://live.gnome.org/GnomeBluetooth @@ -28,6 +28,7 @@ Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-blu # 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 @@ -46,7 +47,7 @@ Requires: obexd Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description The gnome-bluetooth package contains graphical utilities to setup, @@ -71,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. @@ -109,7 +110,7 @@ translation-update-upstream %patch0 -p1 %build -%configure --disable-schemas-install \ +%configure \ --disable-icon-update \ --disable-scrollkeeper \ --disable-desktop-update \ @@ -126,29 +127,36 @@ find %{buildroot} -type f -name "*.la" -delete -print %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} %clean 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 @@ -159,7 +167,7 @@ rm -rf %{buildroot} %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 @@ -178,6 +186,8 @@ rm -rf %{buildroot} %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 From a9d0c6077fae472dddbe3663b7aa37b8aa0f81e72a6875dbf4eedebf2188c2b6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 9 Aug 2010 21:32:23 +0000 Subject: [PATCH 4/5] Accepting request 45065 from GNOME:Factory checked in (request 45065) OBS-URL: https://build.opensuse.org/request/show/45065 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=47 --- gnome-bluetooth-2.30.0.tar.bz2 | 3 ++ gnome-bluetooth-2.31.6.tar.bz2 | 3 -- gnome-bluetooth.changes | 26 ------------ gnome-bluetooth.spec | 75 ++++++++++++++-------------------- 4 files changed, 33 insertions(+), 74 deletions(-) create mode 100644 gnome-bluetooth-2.30.0.tar.bz2 delete mode 100644 gnome-bluetooth-2.31.6.tar.bz2 diff --git a/gnome-bluetooth-2.30.0.tar.bz2 b/gnome-bluetooth-2.30.0.tar.bz2 new file mode 100644 index 0000000..c48eba5 --- /dev/null +++ b/gnome-bluetooth-2.30.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4 +size 1015602 diff --git a/gnome-bluetooth-2.31.6.tar.bz2 b/gnome-bluetooth-2.31.6.tar.bz2 deleted file mode 100644 index cab3be1..0000000 --- a/gnome-bluetooth-2.31.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:050c7f18b9a7640355f4d58f063f943fe2d79bac792bca1752bf186f70a11672 -size 1214926 diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index abb2392..86f82f0 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,29 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 5cbbc00..9887263 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.31.6) +# spec file for package gnome-bluetooth (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,20 +15,11 @@ # 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 @@ -39,15 +30,19 @@ BuildRequires: libunique-devel BuildRequires: nautilus-sendto-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Requires: %{name}-lang = %{version} -# Require bluez (mandatory, as per readme, bnc#622946) -Requires: bluez >= 4.36 -# Require obexd for bluetooth-sendto to work (bnc#622946) -Requires: obexd +License: GPLv2+ +Group: System/GUI/GNOME +Version: 2.30.0 +Release: 3 +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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%glib2_gsettings_schema_requires +Requires: %{name}-lang = %{version} +%gconf_schemas_prereq %description The gnome-bluetooth package contains graphical utilities to setup, @@ -57,8 +52,7 @@ monitor and use Bluetooth devices. License: GPLv2+ Summary: GNOME Bluetooth Support Group: Development/Libraries/GNOME -Requires: %{name} = %{version} -Requires: gtk2-devel +Requires: %{name} = %{version} gtk2-devel Obsoletes: libgnomebt-devel < 0.12 Provides: libgnomebt-devel = 0.12 @@ -72,13 +66,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-bluetooth8 +%package -n libgnome-bluetooth7 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Group: System/GUI/GNOME Obsoletes: libgnomebt1 <= 0.12 -%description -n libgnome-bluetooth8 +%description -n libgnome-bluetooth7 The gnome-bluetooth package contains graphical utilities to setup, monitor and use Bluetooth devices. @@ -110,12 +104,12 @@ translation-update-upstream %patch0 -p1 %build -%configure \ +%configure --disable-schemas-install \ --disable-icon-update \ --disable-scrollkeeper \ --disable-desktop-update \ --enable-introspection -%__make %{?_smp_mflags} +%__make %{?jobs:-j%jobs} %install %makeinstall @@ -123,40 +117,33 @@ 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 +%suse_update_desktop_file -G "Configure Bluetooth settings" -N "Bluetooth Properties" bluetooth-properties HardwareSettings %suse_update_desktop_file -G "Bluetooth Manager applet" bluetooth-applet %find_lang %{name}2 %find_lang %{name} %{name}2.lang -%fdupes %{buildroot} +%find_gconf_schemas +%fdupes $RPM_BUILD_ROOT %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT -%post -%glib2_gsettings_schema_post +%pre -f %{name}.schemas_pre -%postun -%glib2_gsettings_schema_postun +%posttrans -f %{name}.schemas_posttrans -%post -n nautilus-sendto-plugin-bluetooth -%glib2_gsettings_schema_post +%preun -f %{name}.schemas_preun -%postun -n nautilus-sendto-plugin-bluetooth -%glib2_gsettings_schema_postun +%post -n libgnome-bluetooth7 -p /sbin/ldconfig -%post -n libgnome-bluetooth8 -p /sbin/ldconfig +%postun -n libgnome-bluetooth7 -p /sbin/ldconfig -%postun -n libgnome-bluetooth8 -p /sbin/ldconfig - -%files +%files -f %{name}.schemas_list %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/bluetooth-* %{_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}/gnome-bluetooth/ +%{_datadir}/gnome-bluetooth %{_datadir}/icons/hicolor/*/*/bluetooth* %{_mandir}/man1/bluetooth-* # Own the plugin directory, but exclude the plugin library itself @@ -167,7 +154,7 @@ rm -rf %{buildroot} %files lang -f %{name}2.lang -%files -n libgnome-bluetooth8 +%files -n libgnome-bluetooth7 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* %{_libdir}/girepository-1.0/*.typelib @@ -186,8 +173,6 @@ rm -rf %{buildroot} %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 From 2455de0c3bf8106a1c5cae730b24d42fd7897416bbe19ec539ecee26a95df65a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 Aug 2010 21:32:24 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/gnome-bluetooth revision 32.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=7e1c49b2617df52e782735798d0ea798 --- gnome-bluetooth-2.30.0.tar.bz2 | 3 -- gnome-bluetooth-2.31.6.tar.bz2 | 3 ++ gnome-bluetooth.changes | 26 ++++++++++++ gnome-bluetooth.spec | 75 ++++++++++++++++++++-------------- 4 files changed, 74 insertions(+), 33 deletions(-) delete mode 100644 gnome-bluetooth-2.30.0.tar.bz2 create mode 100644 gnome-bluetooth-2.31.6.tar.bz2 diff --git a/gnome-bluetooth-2.30.0.tar.bz2 b/gnome-bluetooth-2.30.0.tar.bz2 deleted file mode 100644 index c48eba5..0000000 --- a/gnome-bluetooth-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4 -size 1015602 diff --git a/gnome-bluetooth-2.31.6.tar.bz2 b/gnome-bluetooth-2.31.6.tar.bz2 new file mode 100644 index 0000000..cab3be1 --- /dev/null +++ b/gnome-bluetooth-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:050c7f18b9a7640355f4d58f063f943fe2d79bac792bca1752bf186f70a11672 +size 1214926 diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 86f82f0..abb2392 100644 --- a/gnome-bluetooth.changes +++ b/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 diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 9887263..5cbbc00 100644 --- a/gnome-bluetooth.spec +++ b/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+ -Group: System/GUI/GNOME -Version: 2.30.0 -Release: 3 -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 +Requires: %{name}-lang = %{version} +# Require bluez (mandatory, as per readme, bnc#622946) +Requires: bluez >= 4.36 +# Require obexd for bluetooth-sendto to work (bnc#622946) +Requires: obexd Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 -Requires: %{name}-lang = %{version} -%gconf_schemas_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%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 $RPM_BUILD_ROOT +%fdupes %{buildroot} %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