colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/rpm: turn %ifcfg_warning into a bcond

Browse Source
This commit is contained in:
Lubomir Rintel
2024-05-29 15:11:19 +02:00
parent cfc6cd7a74
commit 151decd333
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/fedora/rpm/NetworkManager.spec
View File

@@ -177,9 +177,9 @@
%endif %endif
%if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9 %if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9
%global ifcfg_warning 1 %bcond_without ifcfg_warning
%else %else
%global ifcfg_warning 0 %bcond_with ifcfg_warning
%endif %endif
%if 0%{?fedora} >= 39 %if 0%{?fedora} >= 39
@@ -965,7 +965,7 @@ cp %{SOURCE7} %{buildroot}%{_sysctldir}
cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/ cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/
%endif %endif
%if 0%{?ifcfg_warning} %if %{with ifcfg_warning}
cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
%endif %endif
%if 0%{?ifcfg_migrate} %if 0%{?ifcfg_migrate}
@@ -1174,7 +1174,7 @@ fi
%{_unitdir}/nm-priv-helper.service %{_unitdir}/nm-priv-helper.service
%dir %{_datadir}/doc/NetworkManager/examples %dir %{_datadir}/doc/NetworkManager/examples
%{_datadir}/doc/NetworkManager/examples/server.conf %{_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 %{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
%endif %endif
%doc NEWS AUTHORS README.md CONTRIBUTING.md %doc NEWS AUTHORS README.md CONTRIBUTING.md