From 4dd8d451a263956a7c3b7cd86e195eafdde01954 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 20 Apr 2016 19:48:31 +0200 Subject: [PATCH] Update to 1.2.0 release --- 0001-nm-pppd-plugin-fix-crash.patch | 30 ----------------------------- NetworkManager-pptp.spec | 14 +++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 0001-nm-pppd-plugin-fix-crash.patch diff --git a/0001-nm-pppd-plugin-fix-crash.patch b/0001-nm-pppd-plugin-fix-crash.patch deleted file mode 100644 index 33d93ac..0000000 --- a/0001-nm-pppd-plugin-fix-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5878c8644f1989464583d3537a88fe16e4664e0d Mon Sep 17 00:00:00 2001 -From: Mikhail Efremov -Date: Wed, 13 Apr 2016 21:43:18 +0300 -Subject: [PATCH] nm-pppd-plugin: fix crash - -A bus name is not an object path. -Fix crash introduced by commit 17ae85788987ef1f7c92a251c535312163144c33. - -(cherry picked from commit f145851f93614473e63d0a7a1a452fedcc90e914) ---- - src/nm-pptp-pppd-plugin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nm-pptp-pppd-plugin.c b/src/nm-pptp-pppd-plugin.c -index 2b8c819..4567fcc 100644 ---- a/src/nm-pptp-pppd-plugin.c -+++ b/src/nm-pptp-pppd-plugin.c -@@ -318,8 +318,8 @@ plugin_init (void) - proxy = g_dbus_proxy_new_sync (bus, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, - NULL, -- NM_DBUS_SERVICE_PPTP_PPP, - bus_name, -+ NM_DBUS_PATH_PPTP_PPP, - NM_DBUS_INTERFACE_PPTP_PPP, - NULL, &err); - g_object_unref (bus); --- -2.5.5 - diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index e9e6a69..6db588e 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -1,17 +1,14 @@ -%global snapshot .rc1 %global ppp_version %(rpm -q ppp-devel --queryformat '%{VERSION}') Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 Version: 1.2.0 -Release: 0.4%{?snapshot}%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.1/%{name}-1.1.93.tar.xz - -Patch0: 0001-nm-pppd-plugin-fix-crash.patch +Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-1.2.0.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -50,8 +47,7 @@ This package contains software for integrating VPN capabilities with the PPTP server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-1.1.93 -%patch0 -p1 +%setup -q %build if [ ! -f configure ]; then @@ -89,8 +85,12 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %dir %{_datadir}/gnome-vpn-properties/pptp %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name +%{_datadir}/appdata/network-manager-pptp.appdata.xml %changelog +* Wed Apr 20 2016 Lubomir Rintel - 1.2.0-1 +- Update to 1.2.0 release + * Thu Apr 14 2016 Lubomir Rintel - 1:1.2.0-0.4.rc1 - Fix a crash diff --git a/sources b/sources index 023206e..fb5cd26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea51fd3132878fc17de84abceaae027f NetworkManager-pptp-1.1.93.tar.xz +c1ed01ab077dcea91d1f95cfcba11d50 NetworkManager-pptp-1.2.0.tar.xz