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

contrib/rpm: turn %split_ifcfg_rh into a bcond

Browse Source
This commit is contained in:
Lubomir Rintel
2024-05-29 15:10:38 +02:00
parent 2066e1743e
commit cfc6cd7a74
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,13 +167,13 @@
%if 0%{?rhel} >= 10 %if 0%{?rhel} >= 10
%bcond_with ifcfg_rh %bcond_with ifcfg_rh
%global split_ifcfg_rh 0 %bcond_with split_ifcfg_rh
%elif 0%{?fedora} >= 36 %elif 0%{?fedora} >= 36
%bcond_without ifcfg_rh %bcond_without ifcfg_rh
%global split_ifcfg_rh 1 %bcond_without split_ifcfg_rh
%else %else
%bcond_without ifcfg_rh %bcond_without ifcfg_rh
%global split_ifcfg_rh 0 %bcond_with split_ifcfg_rh
%endif %endif
%if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9 %if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9
@@ -250,7 +250,7 @@ Obsoletes: NetworkManager-wimax < 1:1.2
Suggests: NetworkManager-initscripts-updown Suggests: NetworkManager-initscripts-updown
%endif %endif
Obsoletes: NetworkManager < %{obsoletes_initscripts_updown} Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
%if 0%{?split_ifcfg_rh} %if %{with split_ifcfg_rh}
Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh} Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
%endif %endif
@@ -571,7 +571,7 @@ deployments.
%package dispatcher-routing-rules %package dispatcher-routing-rules
Summary: NetworkManager dispatcher file for advanced routing rules Summary: NetworkManager dispatcher file for advanced routing rules
Group: System Environment/Base Group: System Environment/Base
%if 0%{?split_ifcfg_rh} %if %{with split_ifcfg_rh}
Requires: %{name}-initscripts-ifcfg-rh Requires: %{name}-initscripts-ifcfg-rh
%endif %endif
BuildArch: noarch BuildArch: noarch
@@ -599,7 +599,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%endif %endif
%if 0%{?split_ifcfg_rh} %if %{with split_ifcfg_rh}
%package initscripts-ifcfg-rh %package initscripts-ifcfg-rh
Summary: NetworkManager plugin for reading and writing connections in ifcfg-rh format Summary: NetworkManager plugin for reading and writing connections in ifcfg-rh format
Group: System Environment/Base Group: System Environment/Base
@@ -1107,7 +1107,7 @@ fi
%{dbus_sys_dir}/org.freedesktop.NetworkManager.conf %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
%{dbus_sys_dir}/nm-dispatcher.conf %{dbus_sys_dir}/nm-dispatcher.conf
%{dbus_sys_dir}/nm-priv-helper.conf %{dbus_sys_dir}/nm-priv-helper.conf
%if %{with ifcfg_rh} && 0%{?split_ifcfg_rh} == 0 %if %{with ifcfg_rh} && %{without split_ifcfg_rh}
%{dbus_sys_dir}/nm-ifcfg-rh.conf %{dbus_sys_dir}/nm-ifcfg-rh.conf
%endif %endif
%{_sbindir}/%{name} %{_sbindir}/%{name}
@@ -1135,7 +1135,7 @@ fi
%{_libexecdir}/nm-priv-helper %{_libexecdir}/nm-priv-helper
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{nmplugindir} %dir %{nmplugindir}
%if %{with ifcfg_rh} && 0%{?split_ifcfg_rh} == 0 %if %{with ifcfg_rh} && %{without split_ifcfg_rh}
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so %{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
%endif %endif
%if %{with nmtui} %if %{with nmtui}
@@ -1291,7 +1291,7 @@ fi
%endif %endif
%if 0%{?split_ifcfg_rh} %if %{with split_ifcfg_rh}
%files initscripts-ifcfg-rh %files initscripts-ifcfg-rh
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so %{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
%{dbus_sys_dir}/nm-ifcfg-rh.conf %{dbus_sys_dir}/nm-ifcfg-rh.conf