diff --git a/.gitignore b/.gitignore index c98b3e4..9bd21aa 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ NetworkManager-pptp-0.8.1.tar.bz2 /NetworkManager-pptp-1.2.2.tar.xz /NetworkManager-pptp-1.2.3-dev-67-g9d5d87f.tar.xz /NetworkManager-pptp-1.2.4.tar.xz +/NetworkManager-pptp-1.2.6.tar.xz diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec index 3927b2e..e89ce1a 100644 --- a/NetworkManager-pptp.spec +++ b/NetworkManager-pptp.spec @@ -8,8 +8,8 @@ Summary: NetworkManager VPN plugin for PPTP Name: NetworkManager-pptp Epoch: 1 -Version: 1.2.4 -Release: 6%{?dist} +Version: 1.2.6 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -17,16 +17,18 @@ Source0: https://download.gnome.org/sources/NetworkManager-pptp/1.2/%{name}-%{ %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) +BuildRequires: glib2-devel BuildRequires: gtk3-devel -BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 BuildRequires: NetworkManager-libnm-devel >= 1:1.2.0 -BuildRequires: glib2-devel +BuildRequires: libnma-devel >= 1.2.0 BuildRequires: ppp-devel BuildRequires: libtool intltool gettext BuildRequires: libsecret-devel +%if %with libnm_glib +BuildRequires: NetworkManager-devel +BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 BuildRequires: libnm-gtk-devel >= 0.9 -BuildRequires: libnma-devel >= 1.2.0 +%endif Requires: dbus Requires: NetworkManager >= 1:1.2.0 @@ -57,7 +59,7 @@ the PPTP server with NetworkManager (GNOME files). %configure \ --disable-static \ %if %without libnm_glib - --without-libnm-glib \ + --without-libnm-glib \ %endif --enable-more-warnings=yes \ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ @@ -87,8 +89,6 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %files -n NetworkManager-pptp-gnome %{_libexecdir}/nm-pptp-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-pptp-editor.so -%dir %{_datadir}/gnome-vpn-properties/pptp -%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui %{_datadir}/appdata/network-manager-pptp.metainfo.xml %if %with libnm_glib @@ -98,6 +98,9 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la %changelog +* Thu Mar 29 2018 Thomas Haller - 1.2.6-1 +- Update to 1.2.6 release + * Wed Feb 07 2018 Fedora Release Engineering - 1:1.2.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 609bdc6..74db50c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a05b36c92870e2e248c0c75b2c7ef577 NetworkManager-pptp-1.2.4.tar.xz +SHA512 (NetworkManager-pptp-1.2.6.tar.xz) = aaa74eba949a93a132ebb956bfec46f8cf7b9807cf984a1fd8c4f71a252709d9e2b144cd7b4ce1f560501056c758f028eeb2c53d5cccaa79f8dc6b9d595763f8