From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Fri, 15 Mar 2013 16:11:59 +0000 (+0900)
Subject: merge with master
X-Git-Tag: 2.1b_release~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=196dd017f5b41eed8dc42f0735b89808876eba5d;p=framework%2Fapi%2Fnfc.git

merge with master
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e60df75..267b141 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ FOREACH(flag ${${fw_name}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
 IF("${ARCH}" STREQUAL "arm")
@@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(${fw_name}
      CLEAN_DIRECT_OUTPUT 1
 )
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/${service}
         FILES_MATCHING
@@ -85,7 +85,7 @@ CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 #ADD_SUBDIRECTORY(test)
 
diff --git a/include/nfc.h b/include/nfc.h
index f217cc0..135ec58 100755
--- a/include/nfc.h
+++ b/include/nfc.h
@@ -188,26 +188,26 @@ typedef enum {
  * @brief The handle to the NDEF record
  * @ingroup CAPI_NETWORK_NFC_NDEF_RECORD_MODULE
  */
-typedef struct ndef_record_s *nfc_ndef_record_h;
+typedef struct _ndef_record_s *nfc_ndef_record_h;
 
 /**
  * @brief The handle to the NDEF message
  * @ingroup CAPI_NETWORK_NFC_NDEF_MESSAGE_MODULE
  */
-typedef struct ndef_message_s *nfc_ndef_message_h;
+typedef struct _ndef_message_s *nfc_ndef_message_h;
 
 /**
  * @brief The handle to the NFC tag
  * @ingroup CAPI_NETWORK_NFC_TAG_MODULE
  */
-typedef struct net_nfc_target_info_s *nfc_tag_h;
+typedef struct _net_nfc_target_info_s *nfc_tag_h;
 
 
 /**
  * @brief The handle to NFC p2p target
  * @ingroup CAPI_NETWORK_NFC_TAG_MODULE
  */
-typedef void* nfc_p2p_target_h;
+typedef void *nfc_p2p_target_h;
 
 /**
  * @brief The default factory key.
diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec
index 2d7f034..8cc818b 100644
--- a/packaging/capi-network-nfc.spec
+++ b/packaging/capi-network-nfc.spec
@@ -1,9 +1,9 @@
 #sbs-git:slp/api/nfc capi-network-nfc 0.0.1 14f15050f8f6ff8217421da04fa5d66e834e2016
 Name:       capi-network-nfc
 Summary:    A NFC library in SLP C API
-Version:    0.0.5
-Release:    1
-Group:      TO_BE/FILLED_IN
+Version:    0.0.7
+Release:    0
+Group:      API/C API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
@@ -15,19 +15,20 @@ BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(capi-appfw-app-manager)
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 %description
+A NFC library in SLP C API.
 
 
 %package devel
-Summary:  A NFC library in SLP C API (Development)
-Group:    TO_BE/FILLED_IN
+Summary:  A NFC library in SLP C API -- Development Files
+Group:    API/C API
 Requires: %{name} = %{version}-%{release}
 
 %description devel
+A NFC library in SLP C API.
 
+This package contains the development files for %{name}.
 
 
 %prep
@@ -36,8 +37,7 @@ Requires: %{name} = %{version}-%{release}
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 make %{?jobs:-j%jobs}
 
diff --git a/src/nfc.c b/src/nfc.c
index b007c59..7e43428 100644
--- a/src/nfc.c
+++ b/src/nfc.c
@@ -885,9 +885,7 @@ void nfc_manager_unset_ndef_discovered_cb( void )
 
 void nfc_manager_set_tag_filter(int filter )
 {
-
-	int ret ;
-	ret = net_nfc_set_tag_filter(filter);
+	net_nfc_set_tag_filter(filter);
 }
 
 int nfc_manager_get_tag_filter(void)