From fb190f0fd1f5715261d00ba8d5772412f46400de Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Mon, 6 May 2024 16:27:01 +0200 Subject: [PATCH] Use Meson for building on RHEL10 Related: RHEL-35580 --- NetworkManager.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 8f57131..66b2c1b 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,7 +6,7 @@ %global epoch_version 1 %global real_version 1.47.90 %global rpm_version %{real_version} -%global release_version 1 +%global release_version 2 %global snapshot %{nil} %global git_sha %{nil} %global bcond_default_debug 0 @@ -42,8 +42,11 @@ %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer ############################################################################### - -%bcond_with meson +%if 0%{?fedora} > 40 || 0%{?rhel} >= 10 +%bcond_without meson +%else +%bcond_with meson +%endif %bcond_without adsl %bcond_without bluetooth %bcond_without wwan @@ -1293,6 +1296,9 @@ fi %changelog +* Mon May 06 2024 Ján Václav - 1:1.47.90-2 +- Use meson to build by default for RHEL 10 (from upstream) + * Fri May 03 2024 Fernando Fernandez Mancera - 1:1.47.90-1 - Upgrade to 1.47.90 (rc1)