diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-01-23 16:12:28 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-01-23 18:24:56 +0100 |
| commit | a9cb294b7334e99454401b3dc41b9523c5bad31d (patch) | |
| tree | 0fa1b1a47c7022b9e2113789d1d5fd9381275cd9 | |
| parent | 46f6e0bc295c44534b97513542e2dfd804ade07d (diff) | |
contrib/fedora: explicitly set "pppd" path in configure script
We have "BuildRequires: ppp-devel". While in Fedora 37 that has a
dependency on "ppp" package, that is not the case on Centos7. I didn't
test others, but the point is it's not always there.
"/usr/sbin/pppd" is provided by "ppp" package, and we might not have it
installed via the build requirements. But we only need it to detect the
path, which is not necessary on RHEL/Fedora. Just set the path
explicitly with the respective configure option.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index c6561f68f4..1670bc26dc 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -714,7 +714,8 @@ Preferably use nmcli instead. -Difcfg_rh=true \ -Difupdown=false \ %if %{with ppp} - -Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \ + -Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \ + -Dpppd="%{_sbindir}/pppd" \ -Dppp=true \ %endif %if %{with firewalld_zone} @@ -855,8 +856,9 @@ autoreconf --install --force --enable-ifcfg-rh=yes \ --enable-ifupdown=no \ %if %{with ppp} - --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --enable-ppp=yes \ + --with-pppd="%{_sbindir}/pppd" \ + --with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}" \ %endif %if %{with firewalld_zone} --enable-firewalld-zone=yes \ |