diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2022-02-22 16:59:16 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-03-06 09:12:06 +0100 |
| commit | bb832641ebb62a0e24b5c67fc88d153a9a46c2ad (patch) | |
| tree | 99543a75b3004bcffe10dfd63d13ca92bd77e1da | |
| parent | 392daa5dabdbabcd5025a125b3d358aeb2587161 (diff) | |
| download | NetworkManager-bb832641ebb62a0e24b5c67fc88d153a9a46c2ad.tar.gz | |
rpm: remove build-time default for plugins on newer distros
On newer distros, remove the build-time default for settings
plugins. All plugins found in the plugin directory will be used.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a36968d7e9..bb559654c6 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -153,9 +153,9 @@ %endif %if 0%{?rhel} > 8 || 0%{?fedora} > 32 -%global config_plugins_default keyfile,ifcfg-rh +%global config_plugins_default_ifcfg_rh 0 %else -%global config_plugins_default ifcfg-rh +%global config_plugins_default_ifcfg_rh 1 %endif %if 0%{?fedora} @@ -699,7 +699,9 @@ Preferably use nmcli instead. -Dfirewalld_zone=false \ %endif -Ddist_version=%{version}-%{release} \ - -Dconfig_plugins_default=%{config_plugins_default} \ +%if %{?config_plugins_default_ifcfg_rh} + -Dconfig_plugins_default=ifcfg-rh \ +%endif -Dresolvconf=no \ -Dnetconfig=no \ -Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \ |