spec,meson: Remove unnecessary rpath

For current circumstances, we don't need explicit rpath for espp-service/client.

meson_options.txt is also revised for default value.

[Version] 0.3.4

Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/meson.build b/meson.build
index 31b5f2de9b9a9d921d4edbc339e885a5170ee843..2bef440e7ee141299a78a90d4e055527d6d3a60e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -19,9 +19,6 @@ configinc = include_directories('.')
 
 common_deps = []
 
-libdir_path = get_option('prefix') + '/' + get_option('libdir')
-message('libdir_path[' + libdir_path + ']')
-
 message('================ common options ================')
 
 conf_data.set('ESPP_SERVICE_VERSION', espp_service_version)

diff --git a/meson_options.txt b/meson_options.txt
index e4d898a3616a134c22acb97557bcb35e5a292f26..33d3025a427c66a97205e5c94321959812099d96 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
 option('sock-path', type: 'string', value: '/tmp/espp_service.sock', description: 'ESPP service socket path')
 option('dlog', type: 'boolean', value: true, description: 'Use dlog')
-option('service-app', type: 'boolean', value: false, description: 'Daemon is launched as Tizen service app')
+option('service-app', type: 'boolean', value: true, description: 'Daemon is launched as Tizen service app')

diff --git a/packaging/espp-service.spec b/packaging/espp-service.spec
index ded88702d4d4106b7b56a49d6c0b326045825ffc..538e25e95092d973ae8458ce276bfa4bacb3030e 100644 (file)
--- a/packaging/espp-service.spec
+++ b/packaging/espp-service.spec
@@ -1,6 +1,6 @@
 Name:       espp-service
 Summary:    ESPP service package which contains client lib. and daemon binary
-Version:    0.3.3
+Version:    0.3.4
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -43,16 +43,16 @@ ESPP service client development header and library
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1} %{SOURCE2} .
 
-%define _lib_dir %{_libdir}
-
 %build
 meson setup --auto-features=disabled \
   --prefix=/usr \
-  --libdir=%{_lib_dir} \
+  --libdir=%{_libdir} \
   --datadir=%{_datadir} \
   -Dsock-path=/tmp/espp_service.sock \
 %if "%{use_service_app}" == "1"
   -Dservice-app=true \
+%else
+  -Dservice-app=false \
 %endif
   build
 
@@ -79,13 +79,13 @@ install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/
 %files client
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_lib_dir}/*.so*
+%{_libdir}/*.so*
 %exclude %{_libdir}/debug/*
 %license LICENSE.APLv2
 
 %files client-devel
 %manifest %{name}.manifest
-%{_lib_dir}/*.so
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/espp-service*.pc
 %{_includedir}/*.h
 

diff --git a/project_def.prop b/project_def.prop
index d8e94f02e4ffe9a0f497ea76a424a1e6a68f0939..186ed78c7474f2011759c7bd3bda214743f183a6 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -11,7 +11,7 @@ profile = mobile-7.0
 USER_SRCS = ./src/daemon/*.c ./src/common/*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.3"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.4"
 
 # User Includes
 USER_INC_DIRS = ./src/daemon ./src/common ./inc ./inc/esplusplayer_capi

diff --git a/src/client/meson.build b/src/client/meson.build
index c997fadcc682e4ff37f1de47b14ce58293bb1167..3fae2edebb113bb0bd837ad5df30574d2e7e1cc8 100644 (file)
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -21,7 +21,6 @@ libespp_service_client = library('espp-service-client',
   version: espp_service_version,
   soversion: version_major,
   install: true,
-  install_rpath: libdir_path
 )
 
 libespp_service_client_dep = declare_dependency(link_with : libespp_service_client,

diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 96d6dfec5eb343445689762d08bb8a2b88bf2d58..5ae78362d3dc747cd77f0c5f7081205d8a659570 100644 (file)
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -28,7 +28,6 @@ executable('espp-service',
   include_directories : [configinc],
   dependencies : daemon_deps,
   install: true,
-  install_rpath : libdir_path,
   pie : true,
 )