diff --git a/.gitignore b/.gitignore index a50997f..3752d85 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ /NetworkManager-l2tp-1.20.4.tar.xz /NetworkManager-l2tp-1.20.6.tar.xz /NetworkManager-l2tp-1.20.8.tar.xz +/NetworkManager-l2tp-1.20.10.tar.xz +/NetworkManager-l2tp-1.20.14.tar.xz +/NetworkManager-l2tp-1.20.16.tar.xz diff --git a/NetworkManager-l2tp.spec b/NetworkManager-l2tp.spec index 150fc28..089a327 100644 --- a/NetworkManager-l2tp.spec +++ b/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,6 +118,35 @@ exit 0 %endif %changelog +* 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 + +* 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 diff --git a/sources b/sources index e831438..a834229 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-l2tp-1.20.8.tar.xz) = 6ed2ab401821878bf775a27d43e540acce0ea6504a1a4bac436164776ef9e0eacef7963f0362691ef4ad7304e30e2c3199ba4fb41e24918b83aab88b34f7bb6a +SHA512 (NetworkManager-l2tp-1.20.16.tar.xz) = d1a8364bae0116d556e1b554846df4efa415c0b84fa667181daae50ea706f7f62fa016290c35985667e9bda7ac237198575083dc816c05f16d6ac997da02aa7d