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
This commit is contained in:
OBS User autobuild 2010-08-09 21:32:23 +00:00 committed by Git OBS Bridge
parent 528704596f
commit a9d0c6077f
4 changed files with 33 additions and 74 deletions

View File

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

View File

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

View File

@ -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 Mon Jun 21 12:09:37 CEST 2010 - vuntz@opensuse.org

View File

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