diff --git a/.gitignore b/.gitignore index db76001..5f436ba 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ NetworkManager-vpnc-0.8.1.tar.bz2 /NetworkManager-vpnc-1.1.92.tar.xz /NetworkManager-vpnc-1.1.93.tar.xz /NetworkManager-vpnc-1.2.2.tar.xz +/NetworkManager-vpnc-1.2.3-dev-75-g7cc8024.tar.xz diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index c4a724f..21c9f59 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -1,12 +1,13 @@ Summary: NetworkManager VPN plugin for vpnc Name: NetworkManager-vpnc Epoch: 1 -Version: 1.2.2 -Release: 1%{?dist} +Version: 1.2.4 +Release: 0.1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base -Source0: https://download.gnome.org/sources/NetworkManager-vpnc/1.2/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/NetworkManager-vpnc/1.2/%{name}-%{version}.tar.xz +Source0: NetworkManager-vpnc-1.2.3-dev-75-g7cc8024.tar.xz BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -16,12 +17,9 @@ BuildRequires: libnm-gtk-devel >= 1.2.0 BuildRequires: libnma-devel >= 1.2.0 BuildRequires: libsecret-devel -Requires: gtk3 Requires: dbus Requires: NetworkManager >= 1:1.2.0 Requires: vpnc -Requires: shared-mime-info -Requires: gnome-keyring Obsoletes: NetworkManager-vpnc < 1:0.9.8.2-2 %global _privatelibs libnm-vpnc-properties[.]so.* @@ -37,7 +35,9 @@ Summary: NetworkManager VPN plugin for vpnc - GNOME files Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: nm-connection-editor +Requires: gtk3 +Requires: shared-mime-info +Requires: gnome-keyring Obsoletes: NetworkManager-vpnc < 1:0.9.8.2-2 %description -n NetworkManager-vpnc-gnome @@ -45,14 +45,13 @@ This package contains software for integrating VPN capabilities with the vpnc server with NetworkManager (GNOME files). %prep -%setup -q +%setup -q -n NetworkManager-vpnc-1.2.3 %build %configure \ --disable-static \ --enable-more-warnings=yes \ - --with-tests=yes \ --with-dist-version=%{version}-%{release} make %{?_smp_mflags} @@ -82,22 +81,32 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang +%{_libdir}/NetworkManager/libnm-vpn-plugin-vpnc.so %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf +%{_prefix}/lib/NetworkManager/VPN/nm-vpnc-service.name %{_libexecdir}/nm-vpnc-service %{_libexecdir}/nm-vpnc-service-vpnc-helper -%{_libexecdir}/nm-vpnc-auth-dialog -%{_prefix}/lib/NetworkManager/VPN/nm-vpnc-service.name %doc AUTHORS ChangeLog NEWS %license COPYING %files -n NetworkManager-vpnc-gnome -%{_libdir}/NetworkManager/lib*.so +%{_libexecdir}/nm-vpnc-auth-dialog +%{_libdir}/NetworkManager/libnm-*-properties.so +%{_libdir}/NetworkManager/libnm-vpn-plugin-vpnc-editor.so %dir %{_datadir}/gnome-vpn-properties/vpnc %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name %{_datadir}/appdata/network-manager-vpnc.metainfo.xml %changelog +* Mon Sep 12 2016 Thomas Haller - 1.2.4-0.1 +- Update to 1.2.4 pre-release +- Remove GTK dependency from base openvpn package (rh#1088671) +- Introduce new GTK-free VPN plugin base-library to openvpn package +- Don't require nm-connection-editor anymore +- Support NM_VPN_LOG_LEVEL environment variable to control logging +- Support multiple concurrent VPNC connections + * Wed May 11 2016 Lubomir Rintel - 1.2.2-1 - Update to 1.2.2 release diff --git a/sources b/sources index 8191f36..2a42a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c16379738264a117d09c171c645ff23 NetworkManager-vpnc-1.2.2.tar.xz +557904685661bd05631abfad2de8dfc9 NetworkManager-vpnc-1.2.3-dev-75-g7cc8024.tar.xz