From 8b95cf1e886722ce68d41f0c5d962c326dcdf44d Mon Sep 17 00:00:00 2001 From: gaoxingwang Date: Tue, 29 Aug 2023 10:47:13 +0800 Subject: [PATCH] sync bugfix patch and update the way to get ppp version (cherry picked from commit bac4bf56a786600349e2832a0e74a98156e27895) --- NetworkManager.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 62e5c6d..13b7813 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,6 +1,6 @@ %global wireless_tools_version 1:28-0pre9 %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 --modeversion 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 real_version 1.42.8 %global snapshot %{nil} @@ -52,7 +52,7 @@ Name: NetworkManager Version: 1.42.8 Epoch: 1 Release: 3 -Summary: Network Link Manager and User Applications +Summary: 4 License: GPLv2+ URL: https://networkmanager.dev/ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{version}.tar.xz @@ -61,9 +61,8 @@ Source2: 00-server.conf Patch1: fix-wants-and-add-requires.patch Patch2: bugfix-use-PartOf-replace-Requires-in-service.patch Patch3: bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch - -Patch6005: NetworkManager-Add-sw64-architecture.patch -#Patch6006: delete-lease-file-when-connection-deleted.patch +Patch4: NetworkManager-Add-sw64-architecture.patch +Patch5: delete-lease-file-when-connection-deleted.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel glib2-devel gobject-introspection-devel jansson-devel @@ -547,6 +546,13 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Tue Aug 29 2023 gaoxingwang - 1:1.42.8-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:sync bugfix patch: delete lease file when connection deleted and + update the way to get ppp version because patchlevel.h no more provided in ppp-2.5.0 + * Thu Aug 24 2023 gaoxingwang - 1:1.42.8-3 - Type:bugfix - CVE:NA