From ce1cc46f4a113b548ff73aa7f8c055c14b7d9a22 Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Tue, 29 Aug 2023 14:47:24 +0800 Subject: [PATCH] fix install failure because of getting wrong ppp version (cherry picked from commit 9c432591d9d9b2e19c523f95908b3a4bb7f247d1) --- NetworkManager-l2tp.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec index 31d7849..d85857f 100644 --- a/NetworkManager-l2tp.spec +++ b/NetworkManager-l2tp.spec @@ -7,12 +7,12 @@ Summary: NetworkManager VPN plugin for L2TP and L2TP/IPsec Name: NetworkManager-l2tp Version: 1.20.10 -Release: 1 +Release: 2 License: GPLv2+ URL: https://github.com/nm-l2tp/NetworkManager-l2tp Source: https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/%{version}/%{name}-%{version}.tar.xz -%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) BuildRequires: make BuildRequires: gcc @@ -115,6 +115,9 @@ exit 0 %endif %changelog +* Tue Aug 29 2023 gaoxingwang - 1.20.10-2 +- change the way to get ppp version because ppp 2.5.0 no more provide patchlevel.h + * Fri Jul 21 2023 chenzixuan - 1.20.10-1 - Upgrade to 1.20.10