From ace926e648326c19bef0120df01da90f4c800eb2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Feb 2019 19:06:44 +0100 Subject: [PATCH] contrib/rpm: require "vala" instead of "vala-tools" for Fedora 30+ The "vala-tools" package was merged into "vala" [1]. While "vala" now "Provides: vala-tools", update the build requirements for Fedora 30 and newer. [1] https://src.fedoraproject.org/rpms/vala/c/82b21cc3026b8793744c51c34b7e2be7caec4aba https://src.fedoraproject.org/rpms/NetworkManager/c/f6c878a04ad4bbde6474e2f90b6c12c11b685967 (cherry picked from commit 0024485b5a2527fa0af699cf110d807c493b90f8) --- contrib/fedora/rpm/NetworkManager.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a98bd52102..d48004d4e4 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -178,7 +178,11 @@ BuildRequires: gtk-doc %endif BuildRequires: libudev-devel BuildRequires: libuuid-devel +%if 0%{?fedora} >= 30 +BuildRequires: vala +%else BuildRequires: vala-tools +%endif BuildRequires: iptables BuildRequires: libxslt %if %{with bluetooth}