diff --git a/.gitignore b/.gitignore index 9bd21aa..4744b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz /NetworkManager-pptp-1.2.4.tar.xz /NetworkManager-pptp-1.2.6.tar.xz +/NetworkManager-pptp-1.2.8.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index ca451be..f3a56f5 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,10 +1,15 @@ %if 0%{?fedora} < 28 && 0%{?rhel} < 8 %bcond_without libnm_glib %else -# Disable the legacy version by default %bcond_with libnm_glib %endif +%global real_version 1.2.8 +%global rpm_version 1.2.8 +%global release_version 1 + +%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') + Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 @@ -13,7 +18,11 @@ Release: 2%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{version}.tar.xz + + +Source0: https://download.gnome.org/sources/NetworkManager-pptp/%{real_version_major}/%{name}-%{real_version}.tar.xz +#Patch1: 0001-example.patch + %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) @@ -35,12 +44,14 @@ Requires: NetworkManager >= 1:1.2.0 Requires: pptp Requires: ppp + %global __provides_exclude ^libnm-.*\\.so %description This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager. + %package -n NetworkManager-pptp-gnome Summary: NetworkManager VPN plugin for PPTP - GNOME files Group: System Environment/Base @@ -52,8 +63,10 @@ Obsoletes: NetworkManager-pptp < 1:0.9.8.2-3 This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). + %prep -%setup -q +%autosetup -p1 -n "%{name}-%{real_version}" + %build %configure \ @@ -66,9 +79,11 @@ the PPTP server with NetworkManager (GNOME files). --with-dist-version=%{version}-%{release} make %{?_smp_mflags} + %check make check + %install make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -77,6 +92,7 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %find_lang %{name} + %files -f %{name}.lang %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp.so %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf @@ -98,6 +114,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Thu Oct 4 2018 Thomas Haller - 1.2.8-1 +- Update to 1.2.8 release + * Thu Jul 12 2018 Fedora Release Engineering - 1:1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 74db50c..3115edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-pptp-1.2.6.tar.xz) = aaa74eba949a93a132ebb956bfec46f8cf7b9807cf984a1fd8c4f71a252709d9e2b144cd7b4ce1f560501056c758f028eeb2c53d5cccaa79f8dc6b9d595763f8 +SHA512 (NetworkManager-pptp-1.2.8.tar.xz) = ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7