[Tizen-submit] 19626: Changes to Tizen:Generic/bluetooth-frwk

noreply at tizen.org noreply at tizen.org
Tue Jan 14 22:05:13 GMT 2014


Hi,
Jenna have made the following changes to bluetooth-frwk in project Tizen:Generic. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #19626

  submit:       Tizen:Generic:build/bluetooth-frwk(cleanup) -> Tizen:Generic


Message:
Submitter: Jenna <jennax.g.esquivel at intel.com>
Comments: submit/tizen/20140114.215644
Git project: platform/core/connectivity/bluetooth-frwk
Tag: submit/tizen/20140114.215644
Commit: 341e1dff4e826ead1f1c0bbae5d640952ebff864 Modify the condition of checking BT enabled

State:   new        2014-01-14T22:02:37 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- bluetooth-frwk.spec
+++ bluetooth-frwk.spec
@@ -3,7 +3,7 @@
 %bcond_with multi_user
 
 Name:       bluetooth-frwk
-VCS:        platform/core/connectivity/bluetooth-frwk#485674b094d5a2e336460941f5c8c4860390a013
+VCS:        platform/core/connectivity/bluetooth-frwk#341e1dff4e826ead1f1c0bbae5d640952ebff864
 Summary:    Bluetooth framework for BlueZ and Obexd
 Version:    0.2.55
 Release:    2

other changes:
--------------

++++++ bluetooth-frwk-0.2.55.tar.gz
--- bt-api/CMakeLists.txt
+++ bt-api/CMakeLists.txt
@@ -79,8 +79,8 @@
 SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES VERSION ${VERSION})
 TARGET_LINK_LIBRARIES(bluetooth-api ${packages_LDFLAGS})
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-api.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(TARGETS bluetooth-api DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS bluetooth-api DESTINATION lib COMPONENT RuntimeLibraries)
 
 FOREACH(hfile ${HEADERS})
 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/${hfile} DESTINATION include/bt-service)
--- bt-api/bluetooth-api.pc.in
+++ bt-api/bluetooth-api.pc.in
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIB_INSTALL_DIR@
+libdir=@LIBDIR@
 includedir=@INCLUDEDIR@
 
 Name: bluetooth-api
--- bt-api/bt-service-api.pc.in
+++ bt-api/bt-service-api.pc.in
@@ -1,6 +1,6 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIB_INSTALL_DIR@
+libdir=@LIBDIR@
 includedir=@INCLUDEDIR@
 
 Name: bt-service
--- bt-core/bt_core.c
+++ bt-core/bt_core.c
@@ -141,7 +141,6 @@
 
 	BT_DBG("");
 
-#ifdef __TIZEN_MOBILE__
 	status = __bt_core_get_status();
 	if (status == BT_ACTIVATING) {
 		/* Forcely terminate */
@@ -154,17 +153,15 @@
 		BT_DBG("Invalid state %d", status);
 		return -1;
 	}
-#endif
+
 	__bt_core_set_status(BT_DEACTIVATING);
 
 	if (system("/usr/etc/bluetooth/bt-stack-down.sh &") < 0) {
 			BT_DBG("running script failed");
-			__bt_core_set_status(BT_ACTIVATED);
+			__bt_core_set_status( BT_ACTIVATED);
 			return -1;
 	}
-#ifndef __TIZEN_MOBILE__
-	__bt_core_terminate();
-#endif
+
 	return 0;
 }
 


More information about the Tizen-submit mailing list