From 38c799d8832478edc8ff30a1c7407deb4c7894ff Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Mon, 25 Mar 2024 13:53:52 +0100 Subject: [PATCH] contrib/rpm: use meson by default for builds on rawhide As part of our plan to deprecate autotools, we will now be using meson by default to build NM releases on Rawhide. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1905 --- contrib/fedora/rpm/NetworkManager.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 583e962ed..fcbd08873 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -48,8 +48,11 @@ %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer ############################################################################### - -%bcond_with meson +%if 0%{?fedora} > 40 +%bcond_without meson +%else +%bcond_with meson +%endif %bcond_without adsl %bcond_without bluetooth %bcond_without wwan