Add MIT license for json

Change-Id: I5190f2fb2b3417c8103950f5bd4c9d478f07e5a5
Signed-off-by: VBS <sooyeon.kim@samsung.com>

diff --git a/LICENSE.MIT b/LICENSE.MIT
new file mode 100644 (file)
index 0000000..f287fb7
--- /dev/null
+++ b/LICENSE.MIT
@@ -0,0 +1,29 @@
+Following directories are under MIT license.
+- external/nlohmann
+
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.9.1
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file

diff --git a/packaging/org.tizen.multi-assistant-service.spec b/packaging/org.tizen.multi-assistant-service.spec
index 4a940f8473c9b76525b55e9eb78be221e31ff65d..b4c223b4395e14accf5c41a33e7f8e558109ec55 100644 (file)
--- a/packaging/org.tizen.multi-assistant-service.spec
+++ b/packaging/org.tizen.multi-assistant-service.spec
@@ -3,7 +3,7 @@ Summary:        Multi assistant service
 Version:       0.3.40
 Release:       1
 Group:         Graphics & UI Framework/Voice Framework
-License:       Flora-1.1
+License:       Flora-1.1 and MIT
 Source:                %{name}-%{version}.tar.gz
 Source1001:    %{name}.manifest
 
@@ -45,6 +45,10 @@ org.tizen.multi-assistant-service (application)
 %setup -q
 cp %{SOURCE1001} .
 
+cat LICENSE.Flora LICENSE.MIT > LICENSE.merge
+cp LICENSE.merge LICENSE
+rm LICENSE.merge
+
 %build
 LDFLAGS="$LDFLAGS -Wl,-z -Wl,nodelete"
 %if 0%{?sec_build_binary_debug_enable}
@@ -110,4 +114,4 @@ exit 0
 %{_appdir}/bin/*
 #%defattr(-,app,app,-)
 #%{_appbindir}/org.tizen.multi-assistant-service
-%license LICENSE.Flora
+%license LICENSE