Cleanup internal package dependencies and so file path

Change-Id: Ibb415514bce593ca96f812e4b021278114b54375
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/.gitignore b/.gitignore
index 47bd4b3..8b1529d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .project
-.cproject
\ No newline at end of file
+.cproject
+.*.swp

diff --git a/packaging/sensord.manifest b/packaging/sensord.manifest
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
old mode 100755 (executable)
new mode 100644 (file)
index a2e4709..8ae48ac
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -19,6 +19,7 @@ BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(cynara-creds-socket)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-session)
+Requires:   libsensord = %{version}-%{release}
 
 %define auto_rotation_state OFF
 %define orientation_state OFF
@@ -34,18 +35,9 @@ BuildRequires:  pkgconfig(cynara-session)
 %description
 Sensor daemon
 
-%package sensord
-Summary:    Sensor daemon
-Group:      System/Sensor Framework
-Requires:   %{name} = %{version}-%{release}
-
-%description sensord
-Sensor daemon
-
 %package -n libsensord
 Summary:    Sensord library
 Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
 
 %description -n libsensord
 Sensord library
@@ -53,7 +45,7 @@ Sensord library
 %package -n libsensord-devel
 Summary:    Sensord shared library
 Group:      System/Development
-Requires:   %{name} = %{version}-%{release}
+Requires:   libsensord = %{version}-%{release}
 
 %description -n libsensord-devel
 Sensord shared library
@@ -62,7 +54,6 @@ Sensord shared library
 %package -n sensor-test
 Summary:    Sensord library
 Group:      System/Testing
-Requires:   %{name} = %{version}-%{release}
 
 %description -n sensor-test
 Sensor functional testing
@@ -102,7 +93,7 @@ systemctl daemon-reload
 
 %postun -n libsensord -p /sbin/ldconfig
 
-%files -n sensord
+%files
 %attr(0644,root,root)/usr/etc/virtual_sensors.xml
 %manifest sensord.manifest
 %{_bindir}/sensord

diff --git a/src/server/sensor_plugin_loader.cpp.in b/src/server/sensor_plugin_loader.cpp.in
index eb622aa..d370c14 100644 (file)
--- a/src/server/sensor_plugin_loader.cpp.in
+++ b/src/server/sensor_plugin_loader.cpp.in
@@ -99,7 +99,7 @@ using std::static_pointer_cast;
 #define LINEAR_ACCEL_ENABLED 7
 #define ORIENTATION_ENABLED 7
 
-#define HAL_PLUGINS_DIR_PATH "/usr/lib/sensor-hal"
+#define HAL_PLUGINS_DIR_PATH "/usr/lib/sensor"
 
 #define SENSOR_INDEX_SHIFT 16