From 151decd333c2a3925d0c57bd28892d5991ea01fc Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 29 May 2024 15:11:19 +0200 Subject: [PATCH] contrib/rpm: turn %ifcfg_warning into a bcond --- contrib/fedora/rpm/NetworkManager.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 56e892450c..3f3f02646e 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -177,9 +177,9 @@ %endif %if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9 -%global ifcfg_warning 1 +%bcond_without ifcfg_warning %else -%global ifcfg_warning 0 +%bcond_with ifcfg_warning %endif %if 0%{?fedora} >= 39 @@ -965,7 +965,7 @@ cp %{SOURCE7} %{buildroot}%{_sysctldir} cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/ %endif -%if 0%{?ifcfg_warning} +%if %{with ifcfg_warning} cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts %endif %if 0%{?ifcfg_migrate} @@ -1174,7 +1174,7 @@ fi %{_unitdir}/nm-priv-helper.service %dir %{_datadir}/doc/NetworkManager/examples %{_datadir}/doc/NetworkManager/examples/server.conf -%if 0%{?ifcfg_warning} || 0%{?ifcfg_migrate} +%if %{with ifcfg_warning} || 0%{?ifcfg_migrate} %{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt %endif %doc NEWS AUTHORS README.md CONTRIBUTING.md