From: DoHyun Pyun Date: Fri, 11 Mar 2016 06:21:29 +0000 (+0900) Subject: Modify installing directory path for blacklist file X-Git-Tag: accepted/tizen/ivi/20160311.150223 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2Fivi%2F20160311.150223;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-agent.git Modify installing directory path for blacklist file Change-Id: I04bf82ee0aed9f07301172c20eaa53e25ad85d78 Signed-off-by: DoHyun Pyun --- diff --git a/ag-agent/CMakeLists.txt b/ag-agent/CMakeLists.txt index 79f5872..25fe8e1 100644 --- a/ag-agent/CMakeLists.txt +++ b/ag-agent/CMakeLists.txt @@ -31,7 +31,7 @@ ENDFOREACH(flag) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -SET(APP_SYSCONFDIR /opt/var/lib/bluetooth) +SET(APP_SYSCONFDIR /var/lib/bluetooth) ADD_DEFINITIONS("-DAPP_SYSCONFDIR=\"${APP_SYSCONFDIR}\"") @@ -43,7 +43,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.bluez.ag_agent.service DESTINATION share/dbus-1/system-services) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/voice-recognition-blacklist - DESTINATION /opt/var/lib/bluetooth/) + DESTINATION /var/lib/bluetooth/) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-ag-agent.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-ag-agent.conf) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-ag-agent.conf DESTINATION /etc/dbus-1/system.d) diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec index d43e2ba..74f90bd 100644 --- a/packaging/bluetooth-agent.spec +++ b/packaging/bluetooth-agent.spec @@ -96,7 +96,7 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants %{_datadir}/dbus-1/system-services/org.bluez.ag_agent.service #%{_usrlibdir}/systemd/system/bluetooth-ag-agent.service #%{_usrlibdir}/systemd/system/multi-user.target.wants/bluetooth-ag-agent.service -%attr(0666,-,-) /opt/var/lib/bluetooth/voice-recognition-blacklist +%attr(0666,-,-) /var/lib/bluetooth/voice-recognition-blacklist %{_sysconfdir}/dbus-1/system.d/bluetooth-ag-agent.conf %endif %{_datadir}/license/bluetooth-agent