mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-14 20:18:39 +00:00
rpm: split ifcfg-rh settings plugin into a separate package
Split the ifcfg-rh settings plugin into a separate package, so that it will not be in new installations. https://bugzilla.redhat.com/show_bug.cgi?id=2045875
This commit is contained in:
parent
bb832641eb
commit
50a6627fd7
|
@ -22,6 +22,7 @@
|
|||
%global obsoletes_device_plugins 1:0.9.9.95-1
|
||||
%global obsoletes_ppp_plugin 1:1.5.3
|
||||
%global obsoletes_initscripts_updown 1:1.35.4
|
||||
%global obsoletes_ifcfg_rh 1:1.37.1
|
||||
|
||||
%global nmlibdir %{_prefix}/lib/%{name}
|
||||
%global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
|
||||
|
@ -158,6 +159,12 @@
|
|||
%global config_plugins_default_ifcfg_rh 1
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} > 9 || 0%{?fedora} > 35
|
||||
%global split_ifcfg_rh 1
|
||||
%else
|
||||
%global split_ifcfg_rh 0
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
# Although eBPF would be available on Fedora's kernel, it seems
|
||||
# we often get SELinux denials (rh#1651654). But even aside them,
|
||||
|
@ -217,6 +224,9 @@ Obsoletes: NetworkManager-wimax < 1.2
|
|||
Suggests: NetworkManager-initscripts-updown
|
||||
%endif
|
||||
Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# Kept for RHEL to ensure that wired 802.1x works out of the box
|
||||
|
@ -526,6 +536,9 @@ deployments.
|
|||
%package dispatcher-routing-rules
|
||||
Summary: NetworkManager dispatcher file for advanced routing rules
|
||||
Group: System Environment/Base
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
Requires: %{name}-initscripts-ifcfg-rh
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{name}-config-routing-rules < 1:1.31.0
|
||||
|
@ -550,6 +563,19 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
|||
%endif
|
||||
|
||||
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
%package initscripts-ifcfg-rh
|
||||
Summary: NetworkManager plugin for reading and writing connections in ifcfg-rh format
|
||||
Group: System Environment/Base
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
|
||||
|
||||
%description initscripts-ifcfg-rh
|
||||
Installs a plugin for reading and writing connection profiles using
|
||||
the Red Hat ifcfg format in /etc/sysconfig/network-scripts/.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%package cloud-setup
|
||||
Summary: Automatically configure NetworkManager in cloud
|
||||
|
@ -1000,7 +1026,9 @@ fi
|
|||
%{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
|
||||
%{dbus_sys_dir}/nm-dispatcher.conf
|
||||
%{dbus_sys_dir}/nm-priv-helper.conf
|
||||
%if 0%{?split_ifcfg_rh} == 0
|
||||
%{dbus_sys_dir}/nm-ifcfg-rh.conf
|
||||
%endif
|
||||
%{_sbindir}/%{name}
|
||||
%{_bindir}/nmcli
|
||||
%{_datadir}/bash-completion/completions/nmcli
|
||||
|
@ -1023,7 +1051,9 @@ fi
|
|||
%{_libexecdir}/nm-priv-helper
|
||||
%dir %{_libdir}/%{name}
|
||||
%dir %{nmplugindir}
|
||||
%{nmplugindir}/libnm-settings-plugin*.so
|
||||
%if 0%{?split_ifcfg_rh} == 0
|
||||
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
|
||||
%endif
|
||||
%if %{with nmtui}
|
||||
%exclude %{_mandir}/man1/nmtui*
|
||||
%endif
|
||||
|
@ -1043,7 +1073,9 @@ fi
|
|||
%{_mandir}/man8/NetworkManager-dispatcher.8.gz
|
||||
%{_mandir}/man8/NetworkManager-wait-online.service.8.gz
|
||||
%dir %{_localstatedir}/lib/NetworkManager
|
||||
%if 0%{?split_ifcfg_rh} == 0
|
||||
%dir %{_sysconfdir}/sysconfig/network-scripts
|
||||
%endif
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
|
||||
%{_datadir}/polkit-1/actions/*.policy
|
||||
|
@ -1171,6 +1203,14 @@ fi
|
|||
%endif
|
||||
|
||||
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
%files initscripts-ifcfg-rh
|
||||
%dir %{_sysconfdir}/sysconfig/network-scripts
|
||||
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
|
||||
%{dbus_sys_dir}/nm-ifcfg-rh.conf
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%files cloud-setup
|
||||
%{_libexecdir}/nm-cloud-setup
|
||||
|
|
Loading…
Reference in a new issue