From 627dc8a9334ec96951f9c3f2cf0720915594f526 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 21 Nov 2019 15:14:50 +0100 Subject: [PATCH] contrib/rpm: use proper check for nmtui conditional build (cherry picked from commit 0f4819ab3651bcd7bc0916c1a3c1e2fcc6612f71) (cherry picked from commit cca752af94c54021ba1f697649711b12f1ad2e87) --- contrib/fedora/rpm/NetworkManager.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 2f7f5df20e..0f170287f6 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -503,7 +503,7 @@ configurations using "/etc/sysconfig/network-scripts/rule-NAME" files (eg, to do policy-based routing). -%if 0%{with_nmtui} +%if %{with nmtui} %package tui Summary: NetworkManager curses-based UI Group: System Environment/Base @@ -570,6 +570,11 @@ by nm-connection-editor and nm-applet in a non-graphical environment. -Diwd=true \ %else -Diwd=false \ +%endif +%if %{with nmtui} + -Dnmtui=true \ +%else + -Dnmtui=false \ %endif -Dvapi=true \ -Dintrospection=true \ @@ -695,6 +700,11 @@ intltoolize --automake --copy --force --with-iwd=yes \ %else --with-iwd=no \ +%endif +%if %{with nmtui} + --with-nmtui=yes \ +%else + --with-nmtui=no \ %endif --enable-vala=yes \ --enable-introspection \