From: Youngjae Shin Date: Wed, 11 Sep 2013 07:55:20 +0000 (+0900) Subject: apply new smartcard service(0.1.27) X-Git-Tag: accepted/tizen/20130913.122457^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_ivi_release;p=platform%2Fcore%2Fconnectivity%2Fsmartcard-plugin-nfc.git apply new smartcard service(0.1.27) Change-Id: If09a6689d8471cf6b9d545a58a3f9af633f427f1 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d783b3..81701ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,13 +14,12 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SRCS) #MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_common REQUIRED dlog smartcard-service-common nfc) +pkg_check_modules(pkgs_common REQUIRED glib-2.0 dlog smartcard-service-common capi-network-nfc) FOREACH(flag ${pkgs_common_CFLAGS}) SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}") ENDFOREACH(flag) -#SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -finstrument-functions") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}") #SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") #SET(CMAKE_C_FLAGS_RELEASE "-O2") diff --git a/NFCTerminal.cpp b/NFCTerminal.cpp index f47a4b9..fdb67cb 100644 --- a/NFCTerminal.cpp +++ b/NFCTerminal.cpp @@ -1,25 +1,25 @@ /* -* Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - + * Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* standard library header */ -#include +#include +#include #include -#include #include +#include /* local header */ #include "Debug.h" @@ -45,42 +45,45 @@ void __attribute__ ((destructor)) lib_fini() { } -/* below trhee functions must be implemented */ -extern "C" EXPORT_API const char *get_name() +/* below three functions must be implemented */ +extern "C" +{ +EXPORT_API const char *get_name() { return se_name; } -extern "C" EXPORT_API void *create_instance() +EXPORT_API void *create_instance() { return (void *)NFCTerminal::getInstance(); } -extern "C" EXPORT_API void destroy_instance(void *instance) +EXPORT_API void destroy_instance(void *instance) { NFCTerminal *inst = (NFCTerminal *)instance; + if (inst == NFCTerminal::getInstance()) { inst->finalize(); } else { - SCARD_DEBUG_ERR("instance is invalid : getInstance [%p], instance [%p]", NFCTerminal::getInstance(), instance); + _ERR("instance is invalid : getInstance [%p], instance [%p]", + NFCTerminal::getInstance(), instance); } } +} namespace smartcard_service_api { - NFCTerminal::NFCTerminal():Terminal() + NFCTerminal::NFCTerminal() : Terminal(), + seHandle(NULL), opening(false), closed(true) { - seHandle = NULL; - closed = true; name = (char *)se_name; if (initialize()) { - /* TODO : disable nfc library temporary */ -// open(); + open(); } } @@ -98,29 +101,19 @@ namespace smartcard_service_api bool NFCTerminal::initialize() { - int ret = 0; + int ret; - if (initialized == false) - { -#if 0 - if ((ret = net_nfc_client_initialize()) == NET_NFC_OK) - { - if ((ret = net_nfc_set_response_callback(&NFCTerminal::nfcResponseCallback, this)) == NET_NFC_OK) - { - SCARD_DEBUG("nfc initialize success"); + if (initialized == true) + return initialized; - initialized = true; - } - else - { - SCARD_DEBUG_ERR("net_nfc_set_response_callback failed [%d]", ret); - } - } - else - { - SCARD_DEBUG_ERR("net_nfc_initialize failed [%d]", ret); - } -#endif + ret = nfc_manager_initialize_sync(); + if (ret == NFC_ERROR_NONE) + { + initialized = true; + } + else + { + _ERR("net_nfc_initialize failed [%d]", ret); } return initialized; @@ -128,311 +121,177 @@ namespace smartcard_service_api void NFCTerminal::finalize() { + int ret; + if (isInitialized() && isClosed() == false && seHandle != NULL) { - net_nfc_client_se_close_internal_secure_element_sync(seHandle); + close(); + } + + ret = nfc_manager_deinitialize(); + if (ret != NFC_ERROR_NONE) + { + _ERR("nfc_manager_deinitialize failed [%d]", ret); + } + } + + bool NFCTerminal::checkClosed() + { + bool result = false; + + SCOPE_LOCK(mutex) + { + result = (isInitialized() == true && + isClosed() == true && opening == false); + + if (result == true) { + opening = true; + } } - net_nfc_client_deinitialize(); + return result; } bool NFCTerminal::open() { - bool result = true; - net_nfc_error_e ret; + int ret; - SCARD_BEGIN(); + _BEGIN(); - if (isClosed() == true) + if (checkClosed() == true) { -#if 0 - if ((ret = net_nfc_open_internal_secure_element(NET_NFC_SE_TYPE_ESE, this)) == NET_NFC_OK) + ret = nfc_se_open_secure_element(NFC_SE_TYPE_ESE, + &seHandle); + if (ret == NFC_ERROR_NONE) { -#ifndef ASYNC - int rv; - syncLock(); - if ((rv = waitTimedCondition(3)) == 0 && error == NET_NFC_OK) - { -#endif - SCARD_DEBUG("net_nfc_open_internal_secure_element returns [%d]", ret); -#ifndef ASYNC - } - else - { - SCARD_DEBUG_ERR("net_nfc_open_internal_secure_element failed cbResult [%d], rv [%d]", error, rv); - result = false; - } - syncUnlock(); -#endif + closed = false; } else { - SCARD_DEBUG_ERR("net_nfc_set_secure_element_type failed [%d]", ret); - result = false; + _ERR("net_nfc_client_se_open_internal_secure_element_sync failed [%d]", ret); } -#endif + + opening = false; } - SCARD_END(); + _END(); - return result; + return (isClosed() == false); } void NFCTerminal::close() { - net_nfc_error_e ret; + int ret; - SCARD_BEGIN(); + _BEGIN(); - if (isInitialized() && isClosed() == false && seHandle != NULL) + if (isInitialized() && isClosed() == false) { - if ((ret = net_nfc_client_se_close_internal_secure_element_sync(seHandle)) == NET_NFC_OK) - { -#ifndef ASYNC - int rv; - - syncLock(); - if ((rv = waitTimedCondition(3)) == 0 && error == NET_NFC_OK) - { -#endif - SCARD_DEBUG("net_nfc_close_internal_secure_element returns [%d]", ret); -#ifndef ASYNC - } - else - { - SCARD_DEBUG_ERR("net_nfc_close_internal_secure_element failed, error [%d], rv [%d]", error, rv); - } - syncUnlock(); -#endif - } - else - { - SCARD_DEBUG_ERR("net_nfc_close_internal_secure_element failed [%d]", ret); + ret = nfc_se_close_secure_element(seHandle); + if (ret == NFC_ERROR_NONE) { + } else { + _ERR("net_nfc_client_se_close_internal_secure_element_sync failed [%d]", ret); } + + seHandle = NULL; + closed = true; } - SCARD_END(); + _END(); } - bool NFCTerminal::isClosed() + bool NFCTerminal::isClosed() const { return closed; } - int NFCTerminal::transmitSync(ByteArray command, ByteArray &response) + int NFCTerminal::transmitSync(const ByteArray &command, ByteArray &response) { - int rv = 0; - data_h data; + int rv = -1; - SCARD_BEGIN(); + _BEGIN(); if (isClosed() == false) { - SCOPE_LOCK(mutex) + if (command.size() > 0) { - if (command.getLength() > 0) + SCOPE_LOCK(mutex) { - SCARD_DEBUG("command : %s", command.toString()); - -#ifndef ASYNC - response.releaseBuffer(); -#endif - net_nfc_create_data(&data, command.getBuffer(), command.getLength()); - net_nfc_client_se_send_apdu_sync(seHandle, data, NULL); -#ifndef ASYNC - syncLock(); - rv = waitTimedCondition(3); - - if (rv == 0 && error == NET_NFC_OK) + uint8_t *resp = NULL; + uint32_t resp_len; + + rv = nfc_se_send_apdu(seHandle, + (uint8_t *)command.getBuffer(), + command.size(), + &resp, + &resp_len); + if (rv == NFC_ERROR_NONE && + resp != NULL) { - SCARD_DEBUG("transmit success, length [%d]", response.getLength()); + response.assign(resp, resp_len); + + g_free(resp); } else { - SCARD_DEBUG_ERR("transmit failed, rv [%d], cbResult [%d]", rv, error); + _ERR("net_nfc_send_apdu_sync failed, [%d]", rv); } - syncUnlock(); - - rv = error; -#endif - net_nfc_free_data(data); - } - else - { - rv = -1; } } + else + { + _ERR("invalid command"); + } } else { - rv = -1; + _ERR("closed..."); } - SCARD_END(); + _END(); return rv; } int NFCTerminal::getATRSync(ByteArray &atr) { - int rv = 0; + int rv = -1; - SCARD_BEGIN(); + _BEGIN(); - SCOPE_LOCK(mutex) - { - /* TODO : implement nfc first */ - } - - SCARD_END(); - - return rv; - } - - bool NFCTerminal::isSecureElementPresence() - { - return (seHandle != NULL); - } - - void NFCTerminal::nfcResponseCallback(net_nfc_message_e message, net_nfc_error_e result, void *data , void *userContext, void *transData) - { - NFCTerminal *instance = (NFCTerminal *)userContext; - - SCARD_BEGIN(); - - if (instance == NULL) - { - SCARD_DEBUG_ERR("instance is null"); - return; - } - - switch(message) + if (isClosed() == false) { - case NET_NFC_MESSAGE_SET_SE : - SCARD_DEBUG("NET_NFC_MESSAGE_SET_SE"); - break; - - case NET_NFC_MESSAGE_GET_SE : - SCARD_DEBUG("NET_NFC_MESSAGE_GET_SE"); - break; - - case NET_NFC_MESSAGE_OPEN_INTERNAL_SE : - SCARD_DEBUG("NET_NFC_MESSAGE_OPEN_INTERNAL_SE"); - - if (result == NET_NFC_OK) - { - if (data != NULL) - { - instance->seHandle = (net_nfc_target_handle_h)data; - instance->closed = false; - } - else - { - SCARD_DEBUG_ERR("NET_NFC_MESSAGE_OPEN_INTERNAL_SE failed"); - } - } - else - { - SCARD_DEBUG_ERR("NET_NFC_MESSAGE_OPEN_INTERNAL_SE returns error [%d]", result); - } - - instance->error = result; - -#ifndef ASYNC - instance->syncLock(); - instance->signalCondition(); - instance->syncUnlock(); -#else - /* TODO : async process */ -#endif - break; - - case NET_NFC_MESSAGE_CLOSE_INTERNAL_SE : - SCARD_DEBUG("NET_NFC_MESSAGE_CLOSE_INTERNAL_SE"); - - if (result == NET_NFC_OK) - { - instance->closed = true; - } - else - { - SCARD_DEBUG_ERR("NET_NFC_MESSAGE_CLOSE_INTERNAL_SE failed [%d]", result); - } - - instance->error = result; - -#ifndef ASYNC - instance->syncLock(); - instance->signalCondition(); - instance->syncUnlock(); -#else - /* TODO : async process */ -#endif - break; - - case NET_NFC_MESSAGE_SEND_APDU_SE : + SCOPE_LOCK(mutex) { - data_h resp = (data_h)data; - - SCARD_DEBUG("NET_NFC_MESSAGE_SEND_APDU_SE"); + uint8_t *temp = NULL; + uint32_t temp_len; - if (result == NET_NFC_OK) + rv = nfc_se_get_atr(seHandle, &temp, &temp_len); + if (rv == NFC_ERROR_NONE && + temp != NULL) { - if (resp != NULL) - { - SCARD_DEBUG("apdu result length [%d]", net_nfc_get_data_length(resp)); - instance->response.setBuffer(net_nfc_get_data_buffer(resp), net_nfc_get_data_length(resp)); - } + atr.assign(temp, temp_len); + + g_free(temp); } else { - SCARD_DEBUG_ERR("NET_NFC_MESSAGE_OPEN_INTERNAL_SE failed [%d]", result); - } - - instance->error = result; - -#ifndef ASYNC - instance->syncLock(); - instance->signalCondition(); - instance->syncUnlock(); -#else - /* TODO : async process */ -#endif - } - break; - - case NET_NFC_MESSAGE_INIT : - { - instance->finalize(); - - /* send notification */ - if (instance->statusCallback != NULL) - { - instance->statusCallback((void *)se_name, NOTIFY_SE_AVAILABLE, 0, NULL); + _ERR("net_nfc_client_se_get_atr_sync failed"); } } - break; + } + else + { + _ERR("closed..."); + } - case NET_NFC_MESSAGE_DEINIT : - { - instance->initialize(); - if (instance->open() == true) - { - /* send notification */ - if (instance->statusCallback != NULL) - { - instance->statusCallback((void *)se_name, NOTIFY_SE_NOT_AVAILABLE, 0, NULL); - } - } - } - break; + _END(); - default: - SCARD_DEBUG("unknown message : [%d], [%d], [%p], [%p], [%p]", message, result, data, userContext, instance); - break; - } + return rv; + } - SCARD_END(); + bool NFCTerminal::isSecureElementPresence() const + { + return (isClosed() == false); } } /* namespace smartcard_service_api */ - diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 71cd1dc..0000000 --- a/debian/changelog +++ /dev/null @@ -1,23 +0,0 @@ -smartcard-plugin-nfc (0.0.0-3) unstable; urgency=low - - * Upload package - * Git: slp/pkgs/s/smartcard-plugin-nfc - * Tag: smartcard-plugin-nfc_0.0.0-3 - - -- Wonkyu Kwon Tue, 13 Mar 2012 13:10:00 +0900 - -smartcard-plugin-nfc (0.0.0-2) unstable; urgency=low - - * namespace and macro name change - * Git: slp/pkgs/s/smartcard-plugin-nfc - * Tag: smartcard-plugin-nfc_0.0.0-2 - - -- Sangsoo Lee Wed, 07 Mar 2012 19:39:40 +0900 - -smartcard-plugin-nfc (0.0.0-1) unstable; urgency=low - - * Initial release (Closes: #nnnn) - * Git: slp/pkgs/s/smartcard-plugin-nfc - * Tag: smartcard-plugin-nfc_0.0.0-1 - - -- Wonkyu Kwon Thu, 31 Jan 2012 00:00:00 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 2bf80a4..0000000 --- a/debian/control +++ /dev/null @@ -1,24 +0,0 @@ -Source: smartcard-plugin-nfc -Priority: extra -Maintainer: Wonkyu Kwon , Sangsoo Lee , Sungjae Lim , Junyong Sim , Sechang Sohn -Build-Depends: debhelper (>= 8.0.0), dlog-dev, smartcard-service-common-dev, libnfc-common-lib-dev, libnfc-manager-dev -Standards-Version: 3.9.2 -Section: libs -Homepage: -#Vcs-Git: git://git.debian.org/collab-maint/smartcard-plugin-nfc.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/smartcard-plugin-nfc.git;a=summary - -Package: smartcard-plugin-nfc -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Smart card service plug-in for NFC - Smart card service(Open mobile API) plug-in for Near Field Communication - -Package: smartcard-plugin-nfc-dbg -Section: debug -Architecture: any -Depends: smartcard-plugin-nfc (= ${binary:Version}) -Description: Smart card service plug-in for NFC (debug) - Smart card service(Open mobile API) plug-in for Near Field Communication - diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e69de29..0000000 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index b760bee..0000000 --- a/debian/rules +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -%: - dh $@ diff --git a/debian/smartcard-plugin-nfc.dirs b/debian/smartcard-plugin-nfc.dirs deleted file mode 100644 index 34b3bc1..0000000 --- a/debian/smartcard-plugin-nfc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/channels diff --git a/debian/smartcard-plugin-nfc.install b/debian/smartcard-plugin-nfc.install deleted file mode 100644 index 7143a33..0000000 --- a/debian/smartcard-plugin-nfc.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/se/lib*.so diff --git a/include/NFCTerminal.h b/include/NFCTerminal.h index 208ae5e..a2209d8 100644 --- a/include/NFCTerminal.h +++ b/include/NFCTerminal.h @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef NFCTERMINAL_H_ #define NFCTERMINAL_H_ /* standard library header */ -/* NFC-Manager header */ -#include "net_nfc.h" +/* Tizen library header */ +#include "nfc.h" /* local header */ #include "Terminal.h" @@ -33,38 +31,32 @@ namespace smartcard_service_api { private: PMutex mutex; - net_nfc_target_handle_h seHandle; + nfc_se_h seHandle; + bool opening; bool closed; - /* temporary data for sync function */ - ByteArray response; - int error; NFCTerminal(); ~NFCTerminal(); - static void nfcResponseCallback(net_nfc_message_e message, net_nfc_error_e result, void *data , void *userContext, void *transData); + bool checkClosed(); public: - static NFCTerminal *getInstance(); bool initialize(); void finalize(); bool open(); - bool isClosed(); + bool isClosed() const; void close(); - bool isSecureElementPresence(); + bool isSecureElementPresence() const; - int transmitSync(ByteArray command, ByteArray &response); + int transmitSync(const ByteArray &command, ByteArray &response); int getATRSync(ByteArray &atr); - int transmit(ByteArray command, terminalTransmitCallback callback, void *userParam) { return -1; }; + int transmit(const ByteArray &command, terminalTransmitCallback callback, void *userParam) { return -1; }; int getATR(terminalGetATRCallback callback, void *userParam) { return -1; } - - friend void nfcResponseCallback(net_nfc_message_e message, net_nfc_error_e result, void *data , void *userContext, void *transData); }; - } /* namespace smartcard_service_api */ #endif /* NFCTERMINAL_H_ */ diff --git a/packaging/smartcard-plugin-nfc b/packaging/smartcard-plugin-nfc deleted file mode 100644 index ec68963..0000000 --- a/packaging/smartcard-plugin-nfc +++ /dev/null @@ -1,206 +0,0 @@ -Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/packaging/smartcard-plugin-nfc.spec b/packaging/smartcard-plugin-nfc.spec index 919ed67..437a473 100755 --- a/packaging/smartcard-plugin-nfc.spec +++ b/packaging/smartcard-plugin-nfc.spec @@ -1,20 +1,21 @@ Name: smartcard-plugin-nfc Summary: Smartcard plugin nfc -Version: 0.0.4 +Version: 0.0.9 Release: 0 -Group: libs -License: Apache License, Version 2.0 +Group: Network & Connectivity/NFC +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1001: smartcard-plugin-nfc.manifest +#ExclusiveArch: %%arm +BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(dlog) -BuildRequires: nfc-client-lib-devel BuildRequires: pkgconfig(smartcard-service-common) -BuildRequires: cmake -BuildRequires: gettext-tools +BuildRequires: pkgconfig(capi-network-nfc) Requires(post): /sbin/ldconfig -Requires(post): /usr/bin/vconftool -requires(postun): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + + %description Smartcard Service plugin nfc @@ -22,38 +23,18 @@ Smartcard Service plugin nfc %setup -q cp %{SOURCE1001} . - -%package devel -Summary: smartcard service -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -smartcard service. - - %build -mkdir obj-arm-limux-qnueabi -cd obj-arm-limux-qnueabi -cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -#make %{?jobs:-j%jobs} - +%cmake . %install -cd obj-arm-limux-qnueabi %make_install -mkdir -p %{buildroot}/usr/share/license -cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-plugin-nfc %{buildroot}/usr/share/license/ - -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %manifest %{name}.manifest %defattr(-,root,root,-) -/usr/lib/se/lib*.so -/usr/share/license/smartcard-plugin-nfc +%{_libdir}/se/lib*.so +%license LICENSE.APLv2