Merge "sensord: initialize member variables in csocket constructors" into devel/tizen_3.0

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 8ae48ac..4b56aa6 100644 (file)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -2,7 +2,7 @@ Name:       sensord
 Summary:    Sensor daemon
 Version:    2.0.0
 Release:    0
-Group:         System/Sensor Framework
+Group:         System/Sensor Framework
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:       sensord.manifest
@@ -38,6 +38,7 @@ Sensor daemon
 %package -n libsensord
 Summary:    Sensord library
 Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
 
 %description -n libsensord
 Sensord library
@@ -107,13 +108,13 @@ systemctl daemon-reload
 %defattr(-,root,root,-)
 %manifest libsensord.manifest
 %{_libdir}/libsensor.so.*
-%{_libdir}/libsensord-devel.so
+%{_libdir}/libsensord-shared.so
 %license LICENSE.APLv2
 
 %files -n libsensord-devel
 %defattr(-,root,root,-)
 %{_includedir}/sensor/*.h
-%{_includedir}/sensord-devel/*.h
+%{_includedir}/sensord-shared/*.h
 %{_libdir}/libsensor.so
 %{_libdir}/pkgconfig/sensor.pc
 %license LICENSE.APLv2

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 0a404d3..e949a05 100755 (executable)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library(${PROJECT_NAME} SHARED
        poller.cpp
 )
 
-target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-devel")
+target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-shared")
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 30a5eff..a17facd 100755 (executable)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -31,6 +31,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
 add_executable(${PROJECT_NAME} ${SERVER_SRCS} ${PLUGIN_SRCS})
 
-target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-devel")
+target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-shared")
 
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
\ No newline at end of file
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index df5670c..cc46347 100644 (file)
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(sensord-devel CXX)
+project(sensord-shared CXX)
 
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(shared_pkgs REQUIRED dlog libxml-2.0)
@@ -43,4 +43,3 @@ install(FILES sensor_types.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 install(FILES sensor_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
-