From 027e5f7dbd1f78e2a39b2ba03dc543854e90c648eb7b45fe1e72add0795d7705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 4 May 2020 12:16:40 +0000 Subject: [PATCH] Accepting request 800032 from home:dimstar:Factory Complete the previous fix - I seem to have forgotten to checkin part 2 OBS-URL: https://build.opensuse.org/request/show/800032 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/NetworkManager-strongswan?expand=0&rev=40 --- NetworkManager-strongswan.changes | 6 ++++++ NetworkManager-strongswan.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NetworkManager-strongswan.changes b/NetworkManager-strongswan.changes index 3f45074..3ba5eb4 100644 --- a/NetworkManager-strongswan.changes +++ b/NetworkManager-strongswan.changes @@ -3,6 +3,12 @@ Fri May 1 09:03:49 UTC 2020 - Dominique Leuenberger - Set the path for the VPN service name file correctly to %_vpnservicedir (provided by macros.NetworkManager). +- Pass --with-nm-libexecdir=%{_libexecdir} to configure to behave + the same as all the other NM-VPN plugins. This results in + nm-strongswan-auth-dialog moving from + %{_libexecdir}/NetworkManager to %{_libexecdir}, but considering + all the other auth-dialog helpers are there as well it is + perfectly welcome. ------------------------------------------------------------------- Sat Jan 25 14:04:46 UTC 2020 - Dominique Leuenberger diff --git a/NetworkManager-strongswan.spec b/NetworkManager-strongswan.spec index cbc47cf..35f04b9 100644 --- a/NetworkManager-strongswan.spec +++ b/NetworkManager-strongswan.spec @@ -65,6 +65,7 @@ cp %{SOURCE99} README.SUSE --disable-static \ --without-libnm-glib \ --with-charon=%{_libexecdir}/ipsec/charon-nm \ + --with-nm_libexecdir=%{_libexecdir} \ --disable-more-warnings %make_build @@ -79,7 +80,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/NetworkManager/libnm-vpn-plugin-strongswan.so %files gnome -%{_libexecdir}/NetworkManager/nm-strongswan-auth-dialog +%{_libexecdir}/nm-strongswan-auth-dialog %{_datadir}/gnome-vpn-properties/ %{_datadir}/appdata/NetworkManager-strongswan.appdata.xml