Merge branch 'tizen_3.0' into tizen

Change license file name

Change-Id: I19723aa65cd27bc1793bc4475b3dafdba9102e85

diff --git a/LICENSE.APLv2 b/LICENSE.Apache-2.0
similarity index 100%
rename from LICENSE.APLv2
rename to LICENSE.Apache-2.0

diff --git a/packaging/capi-mediademuxer.spec b/packaging/capi-mediademuxer.spec
index b39adf5..1bafe37 100755 (executable)
--- a/packaging/capi-mediademuxer.spec
+++ b/packaging/capi-mediademuxer.spec
@@ -51,10 +51,8 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/license
-mkdir -p %{buildroot}/usr/bin
-cp test/mediademuxer_test %{buildroot}/usr/bin
-cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
+mkdir -p %{buildroot}%{_bindir}
+cp test/mediademuxer_test %{buildroot}%{_bindir}
 
 %make_install
 
@@ -67,7 +65,7 @@ cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 %files
 %manifest capi-mediademuxer.manifest
 %{_libdir}/libcapi-mediademuxer.so.*
-%{_datadir}/license/%{name}
+%license LICENSE.Apache-2.0
 %{_bindir}/*
 
 %files devel