change the name and location of license files

Change-Id: I2e555fb1d60725867f95114bc5af9f3b61372aee
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

diff --git a/LICENSE.BSD-2-Clause b/LICENSE.BSD-2-Clause
new file mode 100644 (file)
index 0000000..76c5d00
--- /dev/null
+++ b/LICENSE.BSD-2-Clause
@@ -0,0 +1,27 @@
+Unless it has its own copyright/license embedded in its body, each source file
+is subject to the following license terms:
+
+Copyright (c) 2015, Linaro Limited
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

diff --git a/LICENSE.MIT b/LICENSE.MIT
new file mode 100644 (file)
index 0000000..41ea486
--- /dev/null
+++ b/LICENSE.MIT
@@ -0,0 +1,19 @@
+Copyright (c) 2006, 2007 Marcin Kalicinski
+
+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/include/include/LICENSE b/include/include/LICENSE
deleted file mode 100644 (file)
index 76c5d00..0000000
--- a/include/include/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Unless it has its own copyright/license embedded in its body, each source file
-is subject to the following license terms:
-
-Copyright (c) 2015, Linaro Limited
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

diff --git a/packaging/tef-simulator.spec b/packaging/tef-simulator.spec
index 6ace88124f3b34c052221e372c2c27bf7d0429c9..c77d5dd710df9aa5a0c73e273ec43a1b1ddc63ca 100644 (file)
--- a/packaging/tef-simulator.spec
+++ b/packaging/tef-simulator.spec
@@ -3,7 +3,7 @@ Summary:    TEF TrustZone simulator and it's utilities
 Version:    0.0.3
 Release:    1
 Group:      Security
-License:    Apache-2.0 and MIT and BSD-3-Clause
+License:    Apache-2.0 and MIT and BSD-2-Clause
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
 ExcludeArch: armv6l armv7hl armv7l aarch64
@@ -49,7 +49,7 @@ environment natively (ex. on an emulator).
 %package -n %{name}-client
 Summary:   TEF TrustZone simulator client for CA compilation
 Group:     Security/Libraries
-License:   Apache-2.0 and BSD-3-Clause
+License:   Apache-2.0 and BSD-2-Clause
 Requires: tef-simulator
 
 %description -n %{name}-client
@@ -60,7 +60,7 @@ with TEF Simulator, required to build Client Applications.
 %package -n %{name}-devkit
 Summary:   TEF TrustZone simulator devkit for TA compilation
 Group:     Security/Libraries
-License:   Apache-2.0 and BSD-3-Clause
+License:   Apache-2.0 and BSD-2-Clause
 Requires:  openssl1.1
 Requires: tef-simulator
 
@@ -99,8 +99,6 @@ make %{?jobs:-j%jobs}
 
 %install
 make install
-cp rapidxml/license.txt LICENSE.MIT
-cp include/include/LICENSE LICENSE.BSD
 
 cp -a %{SOURCE1} %{buildroot}%{_datadir}/
 
@@ -147,7 +145,6 @@ fi
 %files -n %{name}
 %license LICENSE
 %license LICENSE.MIT
-%license LICENSE.Krb5-MIT
 %manifest %{_datadir}/tef-simulator.manifest
 %attr(111,security_fw,security_fw) %{bin_dir}/tef-simulator-daemon
 %attr(111,security_fw,security_fw) %{bin_dir}/tef-simulator-daemonctl
@@ -168,7 +165,7 @@ fi
 %files -n %{name}-devkit
 %license LICENSE
 %license LICENSE.MIT
-%license LICENSE.BSD
+%license LICENSE.BSD-2-Clause
 %{bin_dir}/TA_PackageBuilder.sh
 %{bin_dir}/TAPackageMaker
 %{lib_dir}/libTEEStub.a

diff --git a/rapidxml/license.txt b/rapidxml/license.txt
deleted file mode 100644 (file)
index 41ea486..0000000
--- a/rapidxml/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006, 2007 Marcin Kalicinski
-
-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