From ef05be83e2623e65dcc180f88916defe25e9a59f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 18 Apr 2023 18:01:19 -0700 Subject: [PATCH] Fix ppp version discovery --- NetworkManager.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index e826035..6ccb619 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,12 +1,12 @@ %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 || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 %global real_version 1.43.5 %global rpm_version %{real_version} -%global release_version 2 +%global release_version 3 %global snapshot %{nil} %global git_sha %{nil} %global bcond_default_debug 0 @@ -252,7 +252,9 @@ BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: glib2-devel >= 2.40.0 BuildRequires: gobject-introspection-devel >= 0.10.3 %if %{with ppp} -BuildRequires: ppp-devel >= 2.4.5 +# version constraint here is because the use of pkg-config to discover +# the ppp version (above) only works from 2.5.0 onwards +BuildRequires: ppp-devel >= 2.5.0 %endif %if %{with crypto_gnutls} BuildRequires: gnutls-devel >= 2.12 @@ -1246,6 +1248,9 @@ fi %changelog +* Tue Apr 18 2023 Adam Williamson - 1:1.43.5-3 +- Fix ppp version discovery + * Tue Apr 18 2023 Adam Williamson - 1:1.43.5-2 - Rebuild for ppp 2.5.0