summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-11-30 13:31:39 +0100
committerThomas Haller <thaller@redhat.com>2019-12-02 15:16:52 +0100
commit7ff866e679fc55bd77bfda3271ea566a8f5d9812 (patch)
tree2fad10fe4dc877dfe8c3afc7f5cedba01237331d /contrib
parentbc3f5ca6a9fd15434c2998d2f1bc73a8e38dfe0b (diff)
downloadNetworkManager-7ff866e679fc55bd77bfda3271ea566a8f5d9812.tar.gz
contrib/rpm: explicitly enable/disable bluetooth support
The bluetooth plugin (with BlueZ5/NAP support) always gets build, but DUN support requires a library. When enabling build of the bluetooth subpackage, then always enable DUN support. And enable it explicitly, especially meson would not autodetect support and disable it by default. (cherry picked from commit 30f6a5dd21d4f12d72d85708406fe9a6c76ea4d4)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec10
1 files changed, 10 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 373cf0f32e..f7d07f8f2b 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -550,6 +550,11 @@ NetworkManager in cloud setups. Currently only EC2 is supported.
%else
-Diwd=false \
%endif
+%if %{with bluetooth}
+ -Dbluez5_dun=true \
+%else
+ -Dbluez5_dun=false \
+%endif
%if %{with nmtui}
-Dnmtui=true \
%else
@@ -676,6 +681,11 @@ intltoolize --automake --copy --force
%else
--with-iwd=no \
%endif
+%if %{with bluetooth}
+ --enable-bluez5-dun=yes \
+%else
+ --enable-bluez5-dun=no \
+%endif
%if %{with nmtui}
--with-nmtui=yes \
%else