From 969422846e9d0ae7c52d7703a73a9f33d49af76af274c5a6030631f64244b457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 14 Oct 2016 19:21:46 +0000 Subject: [PATCH] Accepting request 433300 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/433300 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=155 --- gnome-bluetooth.changes | 11 +++++++++++ gnome-bluetooth.spec | 12 +++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 4f92d8f..0999392 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 1 18:50:28 UTC 2016 - zaitor@opensuse.org + +- Drop obexd-client Requires: obex was merged into bluez a long + time ago, and we already pull it. +- Drop no longer needed Provides/Obsoletes: bluez-gnome and + nautilus-sendto-plugin-bluetooth. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. +- Stop passing V=1 to make, we do debugging locally. + ------------------------------------------------------------------- Mon Jun 27 08:36:49 UTC 2016 - zaitor@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index fbe20a7..2cce80f 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -27,7 +27,9 @@ Source: http://download.gnome.org/sources/gnome-bluetooth/3.20/%{name}-% BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream +%endif BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 @@ -37,13 +39,7 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(udev) # Require bluez (mandatory, as per readme, bnc#622946) Requires: bluez >= 5 -# Require obexd for bluetooth-sendto to work (bnc#622946) -Requires: obexd-client Recommends: %{name}-lang -Provides: bluez-gnome = 1.8 -Obsoletes: bluez-gnome < 1.8 -# nautilus-sendto-plugin-bluetooth has been removed in version 3.7.4 -Obsoletes: nautilus-sendto-plugin-bluetooth < 3.7.4 # gnome-bluetooth-plugins-geoclue (and entire plugin support) was removed in version 3.11.3 Obsoletes: gnome-bluetooth-plugins-geoclue < 3.11.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -89,14 +85,16 @@ gnome-bluetooth library. %lang_package %prep %setup -q +%if !0%{?is_opensuse} translation-update-upstream +%endif %build %configure \ --disable-icon-update \ --disable-desktop-update \ --enable-introspection -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} %install %make_install