Update to 1.2 git snapshot with libnm-based properties plugin

.gitignore

@@ -6,3 +6,4 @@ NetworkManager-openswan-0.8.tar.gz
 /NetworkManager-openswan-1.0.0.tar.xz
 /NetworkManager-openswan-1.0.2.tar.xz
 /NetworkManager-openswan-1.0.6.tar.xz
+/NetworkManager-openswan-1.2.0.tar.xz

0001-service-add-vendor-property.patch

@@ -1,52 +0,0 @@
-From afce38364f56abeda204b26eefec2e412d1ca5ef Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Thu, 27 Aug 2015 16:38:16 +0200
-Subject: [PATCH] service: add vendor property
-
-This was added and pushed by accident; shouldn't be unconditional. However we
-still need it for testing against Racoon, make it configurable in a fashion
-similar to the VPNC plugin.
-
-Fixes: b59e8b37a15ec8754a17495da2c670af8536e102
-(cherry picked from commit 8c0ffb6b2e7a73f098574c227385c7f8dbbb4035)
----
- src/nm-openswan-service.c | 3 ++-
- src/nm-openswan-service.h | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
-index 40e56f3..7e293d0 100644
---- a/src/nm-openswan-service.c
-+++ b/src/nm-openswan-service.c
-@@ -137,6 +137,7 @@ static ValidProperty valid_properties[] = {
- 	{ NM_OPENSWAN_DPDTIMEOUT,                 G_TYPE_INT, 0, 86400 },
- 	{ NM_OPENSWAN_IKE,                        G_TYPE_STRING, 0, 0 },
- 	{ NM_OPENSWAN_ESP,                        G_TYPE_STRING, 0, 0 },
-+	{ NM_OPENSWAN_VENDOR,                     G_TYPE_STRING, 0, 0 },
- 	/* Ignored option for internal use */
- 	{ NM_OPENSWAN_PSK_INPUT_MODES,            G_TYPE_NONE, 0, 0 },
- 	{ NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES, G_TYPE_NONE, 0, 0 },
-@@ -655,7 +656,7 @@ nm_openswan_config_write (gint fd,
- 	write_config_option (fd, " salifetime=24h\n");
- 	write_config_option (fd, " ikelifetime=24h\n");
- 	write_config_option (fd, " keyingtries=1\n");
--	if (libreswan)
-+	if (libreswan && g_strcmp0 (nm_setting_vpn_get_data_item (s_vpn, NM_OPENSWAN_VENDOR), "Cisco") == 0)
- 		write_config_option (fd, " cisco-unity=yes\n");
- 	write_config_option (fd, " auto=add");
- 
-diff --git a/src/nm-openswan-service.h b/src/nm-openswan-service.h
-index fed9b7c..156ce68 100644
---- a/src/nm-openswan-service.h
-+++ b/src/nm-openswan-service.h
-@@ -41,6 +41,7 @@
- #define NM_OPENSWAN_DPDTIMEOUT "dpdtimeout"
- #define NM_OPENSWAN_IKE  "ike"
- #define NM_OPENSWAN_ESP  "esp"
-+#define NM_OPENSWAN_VENDOR  "vendor"
- 
- #define NM_OPENSWAN_PW_TYPE_SAVE   "save"
- #define NM_OPENSWAN_PW_TYPE_ASK    "ask"
--- 
-2.4.3
-

NetworkManager-openswan.spec

@@ -1,24 +1,22 @@
-%define nm_version        0.9.9.95
+%global snapshot          .20150903git6cb0148
-
+%global nm_version        1.1.0
-%define realversion 1.0.6
 
 Summary:   NetworkManager VPN plug-in for openswan and libreswan
 Name:      NetworkManager-openswan
-Version:   %{realversion}
+Version:   1.2.0
-Release:   2%{?dist}
+Release:   0.1%{?snapshot}%{?dist}
 License:   GPLv2+
+URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-URL:       https://download.gnome.org/sources/NetworkManager-openswan/1.0/
+Source0:   https://download.gnome.org/sources/NetworkManager-openswan/1.2/%{name}-%{version}.tar.xz
-Source0:   https://download.gnome.org/sources/NetworkManager-openswan/1.0/%{name}-%{realversion}.tar.xz
-
-Patch0:    0001-service-add-vendor-property.patch
 
 BuildRequires: gtk3-devel
-BuildRequires: dbus-devel
 BuildRequires: libnl3-devel
 BuildRequires: NetworkManager-devel >= 1:%{nm_version}
 BuildRequires: NetworkManager-glib-devel >= 1:%{nm_version}
+BuildRequires: NetworkManager-libnm-devel >= 1:%{nm_version}
 BuildRequires: libnm-gtk-devel >= %{nm_version}
+BuildRequires: libnma-devel >= %{nm_version}
 BuildRequires: libsecret-devel
 BuildRequires: intltool gettext
 
@@ -41,7 +39,7 @@ with NetworkManager and the GNOME desktop
 Summary: NetworkManager VPN plugin for openswan/libreswan - GNOME files
 Group:   System Environment/Base
 
-Requires: NetworkManager-openswan = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: nm-connection-editor
 
 %description -n NetworkManager-openswan-gnome
@@ -49,17 +47,18 @@ This package contains software for integrating VPN capabilities with
 the openswan/libreswan server with NetworkManager (GNOME files).
 
 %prep
-%setup -q  -n NetworkManager-openswan-%{realversion}
+%setup -q
-%patch0 -p1
 
 %build
-%configure --disable-static --enable-more-warnings=yes
+%configure \
+        --disable-static \
+        --enable-more-warnings=yes \
+        --with-dist-version=%{version}-%{release}
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
-rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
 ln -sf %{_libexecdir}/nm-openswan-service-helper  %{buildroot}%{_libexecdir}/nm-libreswan-service-helper
 
 %find_lang %{name}
@@ -70,29 +69,29 @@ update-desktop-database &> /dev/null || :
 %postun
 update-desktop-database &> /dev/null || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-, root, root,-)
-%doc AUTHORS ChangeLog COPYING
-#%{_libdir}/NetworkManager/lib*.so*
 %{_libexecdir}/nm-openswan-auth-dialog
 %{_sysconfdir}/dbus-1/system.d/nm-openswan-service.conf
-%{_sysconfdir}/NetworkManager/VPN/nm-openswan-service.name
+%{_prefix}/lib/NetworkManager/VPN/nm-openswan-service.name
 %{_libexecdir}/nm-openswan-service
 %{_libexecdir}/nm-openswan-service-helper
 %{_libexecdir}/nm-libreswan-service-helper
 %{_datadir}/applications/nm-openswan-auth-dialog.desktop
+%doc AUTHORS ChangeLog NEWS
+%license COPYING
 
 %files -n NetworkManager-openswan-gnome
-%doc AUTHORS ChangeLog COPYING
 %{_libdir}/NetworkManager/lib*.so*
 %dir %{_datadir}/gnome-vpn-properties/openswan
 %{_datadir}/gnome-vpn-properties/openswan/nm-openswan-dialog.ui
+%{_sysconfdir}/NetworkManager/VPN/nm-openswan-service.name
 
 
 %changelog
+* Tue Sep 1 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.1.20150901git92f1611
+- Update to 1.2 git snapshot with libnm-based properties plugin
+
 * Fri Aug 28 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.0.6-2
 - Don't unconditionally set cisco-unity=yes
 

sources

@@ -1 +1 @@
-df9144805f37dc30dfaeab8da762f615  NetworkManager-openswan-1.0.6.tar.xz
+3906c9337b77cf3b24b1df88b2d08113  NetworkManager-openswan-1.2.0.tar.xz