diff options
author | SukHyung, Kang <shine.kang@samsung.com> | 2016-12-14 16:19:56 +0900 |
---|---|---|
committer | SukHyung, Kang <shine.kang@samsung.com> | 2016-12-14 16:19:56 +0900 |
commit | b680b23c2f9532ea6eeda7d4a41853bcdaa0d5ea (patch) | |
tree | de80b1982a1d766eb6ed8eda266145e34617080f | |
parent | 63fa8613491326350af14b56b9b36336003224d9 (diff) | |
download | media-key-b680b23c2f9532ea6eeda7d4a41853bcdaa0d5ea.tar.gz media-key-b680b23c2f9532ea6eeda7d4a41853bcdaa0d5ea.tar.bz2 media-key-b680b23c2f9532ea6eeda7d4a41853bcdaa0d5ea.zip |
merge media-key code from spin csapisubmit/tizen/20161214.063015accepted/tizen/mobile/20161215.072328
Change-Id: Ibe4d552b8e2126c87562c9cec600f7f485f96bb8
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>
-rwxr-xr-x[-rw-r--r--] | Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec | 25 | ||||
-rwxr-xr-x[-rw-r--r--] | Tizen.System.MediaKey/Tizen.System.MediaKey.project.json | 2 | ||||
-rwxr-xr-x | packaging/csapi-media-key.spec | 3 |
4 files changed, 19 insertions, 13 deletions
diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json index ab1a0ee..1ec1af2 100644..100755 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.Net45.project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Tizen": "1.0.1" + "Tizen": "1.0.2" }, "frameworks": { "net45": {} diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec index 413ac11..4bcf063 100644..100755 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec @@ -1,16 +1,21 @@ <?xml version="1.0"?> <package> - <metadata> + <metadata> <id>Tizen.System.MediaKey</id> <version>$version$</version> - <authors>Tizen Developers</authors> - <description>MediaKey API for Tizen.Net</description> - <dependencies> - <dependency id="Tizen" version="1.0.1" /> - </dependencies> + <authors>Samsung Electronics</authors> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl> + <projectUrl>https://www.tizen.org/</projectUrl> + <iconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</iconUrl> + <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright> + <description>Provides the MediaKey API for Tizen.Net</description> + <dependencies> + <dependency id="Tizen" version="1.0.2" /> + </dependencies> </metadata> - <files> - <file src="bin/$Configuration$/Tizen.System.MediaKey.dll" target="lib/netstandard1.3" /> - <file src="bin/$Configuration$/Net45/Tizen.System.MediaKey.dll" target="lib/net45" /> - </files> + <files> + <file src="bin/$Configuration$/Tizen.System.MediaKey.dll" target="lib/netstandard1.3" /> + <file src="bin/$Configuration$/Net45/Tizen.System.MediaKey.dll" target="lib/net45" /> + </files> </package> diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json b/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json index db7436c..55ec093 100644..100755 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.project.json @@ -1,7 +1,7 @@ { "dependencies": { "NETStandard.Library": "1.6.0", - "Tizen": "1.0.1" + "Tizen": "1.0.2" }, "frameworks": { "netstandard1.3": {} diff --git a/packaging/csapi-media-key.spec b/packaging/csapi-media-key.spec index e6b9b86..acf936b 100755 --- a/packaging/csapi-media-key.spec +++ b/packaging/csapi-media-key.spec @@ -8,7 +8,7 @@ Name: csapi-media-key Summary: Tizen Media Key API for C# -Version: 1.0.1 +Version: 1.0.2 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest AutoReqProv: no +ExcludeArch: %{ix86} aarch64 BuildRequires: mono-compiler BuildRequires: mono-devel |