From: chleun.moon <chleun.moon@samsung.com>
Date: Thu, 20 Apr 2017 02:00:24 +0000 (+0900)
Subject: Merge branch 'ipsec' into tizen
X-Git-Tag: accepted/tizen/unified/20170421.115140~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F126026%2F1;p=platform%2Fupstream%2Fconnman.git

Merge branch 'ipsec' into tizen

Change-Id: I2ecaece689f43bb0c03c9c5929274bfe43e346b0
Signed-off-by: cheoleun <chleun.moon@samsung.com>
---

6289f6a099afd889a013f895fca9df34028c2fb7
diff --cc packaging/connman.spec
index 6f12bbb,6cf5b37..f9a90f6
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@@ -269,9 -292,16 +289,17 @@@ systemctl daemon-reloa
  %{_libdir}/%{name}/plugins-vpn/openvpn.so
  %{_libdir}/%{name}/scripts/openvpn-script
  %{_datadir}/dbus-1/system-services/net.connman.vpn.service
 +%license COPYING
  %endif
  
+ %if %{with connman_ipsec}
+ %files plugin-ipsec
+ %manifest %{name}.manifest
+ %{_libdir}/%{name}/plugins-vpn/ipsec.so
+ %{_libdir}/%{name}/scripts/ipsec-script
+ %{_datadir}/dbus-1/system-services/net.connman.vpn.service
+ %endif
+ 
  %if %{with connman_vpnd}
  %files connman-vpnd
  %manifest %{name}.manifest