Accepting request 750239 from home:seife:testing

- Add bcond for mesh, also enable mesh on Leap 15.2/SLE15SP2.

OBS-URL: https://build.opensuse.org/request/show/750239
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=282

bluez.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Nov 21 16:51:16 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- BuildIgnore shared-mime-info, pulled in by libgio-2_0-0, not
+  required for building, but causes a build loop.
+- Add bcond for mesh, also enable mesh on Leap 15.2/SLE15SP2.
+- Properly conditionalize all files which are only built with enabled
+  mesh functionality, fixes build on Leap 15.1 and earlier.
+
+-------------------------------------------------------------------
+Thu Nov 14 18:17:29 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>
+
+- remove comment
+
 -------------------------------------------------------------------
 Thu Nov  7 11:14:13 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>
 

bluez.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bluez
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 # Copyright (c) 2010-2019 B1 Systems GmbH, Vohburg, Germany
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,6 +17,12 @@
 #
 
 
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%bcond_without mesh
+%else
+%bcond_with    mesh
+%endif
+
 # maintained at https://github.com/seifes-opensuse-packages/bluez.git
 # contributions via pull requests are welcome!
 #
@@ -26,9 +32,8 @@ Release:        0
 Summary:        Bluetooth Stack for Linux
 License:        GPL-2.0-or-later
 Group:          Hardware/Mobile
-Url:            http://www.bluez.org
+URL:            http://www.bluez.org
 Source:         http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
-# just to make crazy checks happy
 Source2147483647:README.md
 Source5:        baselibs.conf
 Source7:        bluetooth.modprobe
@@ -60,8 +65,13 @@ BuildRequires:  pkgconfig(dbus-1) >= 1.6
 BuildRequires:  pkgconfig(ell) >= 0.3
 %endif
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
+# libgio-2_0-0 has a runtime dependency on shared-mime-info, which is not
+# required for building here, but causes a build loop
+#!BuildIgnore:  shared-mime-info
+%if %{with mesh}
 # json-c is needed for --enable-mesh
 BuildRequires:  pkgconfig(json-c)
+%endif
 BuildRequires:  pkgconfig(libcap-ng)
 BuildRequires:  pkgconfig(libical)
 BuildRequires:  pkgconfig(libudev)
@@ -176,7 +186,7 @@ autoreconf -fi
 	--enable-library	\
 	--enable-tools		\
 	--enable-cups		\
-%if 0%{?suse_version} >= 1550
+%if %{with mesh}
 	--enable-mesh		\
 %endif
 	--enable-midi		\
@@ -225,6 +235,7 @@ chmod 0644 *.py *.xml *.dtd
 # fix python shebang
 sed -i -e '1s/env p/p/' %{buildroot}%{_libdir}/bluez/test/{example-gatt-{client,server},test-mesh}
 
+%if %{with mesh}
 # boo#1151518
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
 mv %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth-mesh.conf %{buildroot}%{_defaultdocdir}/%{name}
@@ -240,6 +251,7 @@ org.bluez.mesh.service to %{_datadir}/dbus-1/system-services/,
 then reboot.
 EOF
 touch -r %{SOURCE0} %{buildroot}%{_defaultdocdir}/%{name}/README-mesh.SUSE
+%endif
 
 %check
 %if ! 0%{?qemu_user_space_build}
@@ -272,7 +284,9 @@ make check V=0
 %files
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog README dbus-apis src/main.conf
+%if %{with mesh}
 %doc %{_defaultdocdir}/%{name}/*
+%endif
 %license COPYING
 %{_bindir}/bluemoon
 %{_bindir}/btattach
@@ -291,11 +305,13 @@ make check V=0
 %{_libdir}/bluetooth/plugins/sixaxis.so
 %dir %{_libexecdir}/bluetooth
 %{_libexecdir}/bluetooth/bluetoothd
+%if %{with mesh}
 %{_libexecdir}/bluetooth/bluetooth-meshd
+%endif
 %{_libexecdir}/bluetooth/obexd
 %{_bindir}/bluetoothctl
 %{_bindir}/btmon
-%if 0%{?suse_version} >= 1550
+%if %{with mesh}
 %{_bindir}/meshctl
 %endif
 %{_bindir}/hcidump
@@ -321,7 +337,9 @@ make check V=0
 %dir %{_sysconfdir}/modprobe.d
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
 %{_unitdir}/bluetooth.service
+%if %{with mesh}
 %{_unitdir}/bluetooth-mesh.service
+%endif
 %{_datadir}/dbus-1/system-services/org.bluez.service
 %{_datadir}/dbus-1/services/org.bluez.obex.service
 # not packaged, boo#1151518