diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2023-04-20 10:42:58 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2023-04-20 11:55:49 +0200 |
| commit | c67d65f7335f6875599a47e7a2e223e4c5d07f00 (patch) | |
| tree | 76f079d1f5e9b31405546a25ffd711bc789e4857 | |
| parent | 68c30bab164b1fd9e7fe181b6b574de44e39a87c (diff) | |
| download | NetworkManager-c67d65f7335f6875599a47e7a2e223e4c5d07f00.tar.gz | |
rpm: fix detection of ppp version for ppp >= 2.5.0
In ppp 2.5.0 the "patchlevel.h" header file was removed and pkg-config
must be used. Update the detection command to support both ways.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 983c755be9..255342b01c 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -9,7 +9,7 @@ %global wpa_supplicant_version 1:1.1 -%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) +%global ppp_version %(pkg-config --modversion pppd 2>/dev/null || sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 |