From d1cf96de90b3c9bbee84fb7d7a95add4e779f453 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 28 Jul 2010 04:06:13 +0000 Subject: [PATCH] *** empty log message *** --- .cvsignore | 1 + NetworkManager-openvpn.spec | 15 +++++++++------ import-export.patch | 14 -------------- sources | 2 +- 4 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 import-export.patch diff --git a/.cvsignore b/.cvsignore index c8f7306..a929ef0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ NetworkManager-openvpn-0.8.tar.bz2 NetworkManager-openvpn-0.8.git20100411.tar.bz2 NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 +NetworkManager-openvpn-0.8.1.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index db2497c..ca0bbba 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,17 +1,17 @@ -%define nm_version 1:0.7.997 +%define nm_version 1:0.8.1 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define openvpn_version 2.1 %define shared_mime_version 0.16-3 -%define snapshot .git20100609 -%define realversion 0.8.0.997 +%define snapshot %{nil} +%define realversion 0.8.1 Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 0.8.1 -Release: 0.1%{snapshot}%{?dist} +Release: 1%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -21,7 +21,6 @@ Group: System Environment/Base # - make distcheck # - use generated NetworkManager-openvpn-0.8.tar.bz2 Source: %{name}-%{realversion}%{snapshot}.tar.bz2 -Patch0: import-export.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -53,7 +52,6 @@ with NetworkManager and the GNOME desktop. %prep %setup -q -n %{name}-%{realversion} -%patch0 -p1 -b .importexport %build if [ ! -f configure ]; then @@ -105,6 +103,11 @@ fi %dir %{_datadir}/gnome-vpn-properties/openvpn %changelog +* Tue Jul 27 2010 Dan Williams - 1:0.8.1-1 +- Update to 0.8.1 release +- Updated translations +- Fix crash when checking whether some private keys are encrypted + * Wed Jun 9 2010 Dan Williams - 1:0.8.1-0.1.git20100609 - Add support for PKCS#8 private keys - Add support for unencrypted private keys (rh #497454) diff --git a/import-export.patch b/import-export.patch deleted file mode 100644 index 771d441..0000000 --- a/import-export.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c ---- NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c.foo 2010-06-09 22:15:22.095413377 -0700 -+++ NetworkManager-openvpn-0.8.0.997/properties/nm-openvpn.c 2010-06-09 22:15:31.771412470 -0700 -@@ -767,8 +767,8 @@ openvpn_plugin_ui_interface_init (NMVpnP - /* interface implementation */ - iface_class->ui_factory = ui_factory; - iface_class->get_capabilities = get_capabilities; -- iface_class->import_from_file = import; -- iface_class->export_to_file = export; -+ iface_class->import = import; -+ iface_class->export = export; - iface_class->get_suggested_name = get_suggested_name; - iface_class->delete_connection = delete_connection; - } diff --git a/sources b/sources index e802f7f..bbe47e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8a571e5594765b7a412d560afc16396 NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 +0995450e31d1a47c3e3767de9773b7a7 NetworkManager-openvpn-0.8.1.tar.bz2