From 7370c1b3e996448bcf791834e4e13bcde4c8555c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 21 May 2024 01:30:30 +0300 Subject: [PATCH] import NetworkManager-l2tp-1.20.16-1.el8 --- .NetworkManager-l2tp.metadata | 2 +- .gitignore | 2 +- SPECS/NetworkManager-l2tp.spec | 43 +++++++++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/.NetworkManager-l2tp.metadata b/.NetworkManager-l2tp.metadata index 079751b..27f82a6 100644 --- a/.NetworkManager-l2tp.metadata +++ b/.NetworkManager-l2tp.metadata @@ -1 +1 @@ -d87b4f54f8f42a59cd00d8690b7a3ea0517db503 SOURCES/NetworkManager-l2tp-1.20.8.tar.xz +4ea8b549d75787077ac6510f74e8c4e1feaf9097 SOURCES/NetworkManager-l2tp-1.20.16.tar.xz diff --git a/.gitignore b/.gitignore index c3d5c21..cdf091e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-l2tp-1.20.8.tar.xz +SOURCES/NetworkManager-l2tp-1.20.16.tar.xz diff --git a/SPECS/NetworkManager-l2tp.spec b/SPECS/NetworkManager-l2tp.spec index f4c409d..6fbe72f 100644 --- a/SPECS/NetworkManager-l2tp.spec +++ b/SPECS/NetworkManager-l2tp.spec @@ -6,13 +6,13 @@ Summary: NetworkManager VPN plugin for L2TP and L2TP/IPsec Name: NetworkManager-l2tp -Version: 1.20.8 +Version: 1.20.16 Release: 1%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later 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 @@ -20,7 +20,9 @@ BuildRequires: glib2-devel BuildRequires: gtk3-devel BuildRequires: NetworkManager-libnm-devel >= 1:1.20.0 BuildRequires: libnma-devel >= 1.8.0 -BuildRequires: ppp-devel +BuildRequires: pkgconfig +BuildRequires: ppp-devel >= 2.4.5 +BuildRequires: autoconf automake BuildRequires: libtool gettext BuildRequires: libsecret-devel BuildRequires: openssl-devel >= 1:1.1.0 @@ -52,7 +54,7 @@ This package contains software for integrating L2TP and L2TP over IPsec VPN support with the NetworkManager (GNOME files). %prep -%setup -q +%autosetup -p1 %build if [ ! -f configure ]; then @@ -116,9 +118,38 @@ exit 0 %endif %changelog -* Wed Mar 20 2024 MSVSphere Packaging Team - 1.20.8-1 +* Sat May 18 2024 Douglas Kosovic - 1.20.16-1 +- Updated to 1.20.16 release + +* Sun Apr 14 2024 Douglas Kosovic - 1.20.14-1 +- Updated to 1.20.14 release + +* Wed Mar 20 2024 MSVSphere Packaging Team - 1.20.10-5 - Rebuilt for MSVSphere 8.9 +* Mon Jan 22 2024 Fedora Release Engineering - 1.20.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.20.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Nov 03 2023 Íñigo Huguet - 1.20.10-3 +- Migrated to SPDX license + +* Wed Jul 19 2023 Fedora Release Engineering - 1.20.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon May 01 2023 Douglas Kosovic - 1.20.10-1 +- Updated to 1.20.10 release +- Remove redundant ppp related patches +- Use ppp_version macro from NetworkManager + +* Tue Apr 18 2023 Adam Williamson - 1.20.8-3 +- Rebuild for new ppp + +* Wed Jan 18 2023 Fedora Release Engineering - 1.20.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 30 2022 Douglas Kosovic - 1.20.8-1 - Updated to 1.20.8 release - Added conditional recommends for NetworManager-l2tp-gnome and plasma-nm-l2tp