fix build errors

Change-Id: I8cc6eff03a7035fae2a5816f13e6d118d6d2abeb
Signed-off-by: Youngjae Shin <yj99.shin@samsung.com>

diff --git a/NFCTerminal.cpp b/NFCTerminal.cpp
index a2573b1..f47a4b9 100644 (file)
--- a/NFCTerminal.cpp
+++ b/NFCTerminal.cpp
@@ -21,10 +21,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-/* SLP library header */
-#include "net_nfc.h"
-#include "net_nfc_internal_se.h"
-
 /* local header */
 #include "Debug.h"
 #include "TerminalInterface.h"
@@ -107,7 +103,7 @@ namespace smartcard_service_api
                if (initialized == false)
                {
 #if 0
-                       if ((ret = net_nfc_initialize()) == NET_NFC_OK)
+                       if ((ret = net_nfc_client_initialize()) == NET_NFC_OK)
                        {
                                if ((ret = net_nfc_set_response_callback(&NFCTerminal::nfcResponseCallback, this)) == NET_NFC_OK)
                                {
@@ -134,10 +130,10 @@ namespace smartcard_service_api
        {
                if (isInitialized() && isClosed() == false && seHandle != NULL)
                {
-                       net_nfc_close_internal_secure_element(seHandle, this);
+                       net_nfc_client_se_close_internal_secure_element_sync(seHandle);
                }
 
-               net_nfc_deinitialize();
+               net_nfc_client_deinitialize();
        }
 
        bool NFCTerminal::open()
@@ -190,7 +186,7 @@ namespace smartcard_service_api
 
                if (isInitialized() && isClosed() == false && seHandle != NULL)
                {
-                       if ((ret = net_nfc_close_internal_secure_element(seHandle, this)) == NET_NFC_OK)
+                       if ((ret = net_nfc_client_se_close_internal_secure_element_sync(seHandle)) == NET_NFC_OK)
                        {
 #ifndef ASYNC
                                int rv;
@@ -242,7 +238,7 @@ namespace smartcard_service_api
                                        response.releaseBuffer();
 #endif
                                        net_nfc_create_data(&data, command.getBuffer(), command.getLength());
-                                       net_nfc_send_apdu(seHandle, data, this);
+                                       net_nfc_client_se_send_apdu_sync(seHandle, data, NULL);
 #ifndef ASYNC
                                        syncLock();
                                        rv = waitTimedCondition(3);

diff --git a/include/NFCTerminal.h b/include/NFCTerminal.h
index 56204a9..208ae5e 100644 (file)
--- a/include/NFCTerminal.h
+++ b/include/NFCTerminal.h
@@ -20,8 +20,8 @@
 
 /* standard library header */
 
-/* SLP library header */
-#include "net_nfc_typedef.h"
+/* NFC-Manager header */
+#include "net_nfc.h"
 
 /* local header */
 #include "Terminal.h"

diff --git a/packaging/smartcard-plugin-nfc.spec b/packaging/smartcard-plugin-nfc.spec
index 52b1565..919ed67 100755 (executable)
--- a/packaging/smartcard-plugin-nfc.spec
+++ b/packaging/smartcard-plugin-nfc.spec
@@ -1,6 +1,6 @@
 Name:             smartcard-plugin-nfc
 Summary:          Smartcard plugin nfc
-Version:          0.0.3
+Version:          0.0.4
 Release:          0
 Group:            libs
 License:          Apache License, Version 2.0
@@ -8,7 +8,7 @@ Source0:          %{name}-%{version}.tar.gz
 Source1001:    smartcard-plugin-nfc.manifest
 BuildRequires:    pkgconfig(glib-2.0)
 BuildRequires:    pkgconfig(dlog)
-BuildRequires:    pkgconfig(nfc)
+BuildRequires:    nfc-client-lib-devel
 BuildRequires:    pkgconfig(smartcard-service-common)
 BuildRequires:    cmake
 BuildRequires:    gettext-tools
@@ -52,12 +52,6 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-plugin-nfc %{buildroo
 %postun
 /sbin/ldconfig
 
-#%post
-# -n nfc-common-lib -p /sbin/ldconfig
-
-#%postun
-# -n nfc-common-lib -p /sbin/ldconfig
-
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)