From e6c0a5eaff5ac24a372525e55366737a5560595f Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Thu, 4 Jul 2019 16:53:09 +0900 Subject: [PATCH] Remove dependency on gmock in main rpm Change-Id: I7a7aaa7470819e743781492d5b98c7369e4a7a01 Signed-off-by: Cheoleun Moon --- CMakeLists.txt | 4 +++- packaging/net-config.spec | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13ab4ee..b210f77 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,4 +132,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-network-config.conf DESTINATIO ADD_SUBDIRECTORY(plugin/headed) ADD_SUBDIRECTORY(plugin/telephony) ADD_SUBDIRECTORY(haltests) -ADD_SUBDIRECTORY(gtest) +IF(BUILD_GTESTS) + ADD_SUBDIRECTORY(gtest) +ENDIF(BUILD_GTESTS) diff --git a/packaging/net-config.spec b/packaging/net-config.spec index a89412d..76a1471 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -1,6 +1,6 @@ Name: net-config Summary: TIZEN Network Configuration service -Version: 1.1.145 +Version: 1.1.146 Release: 3 Group: System/Network License: Apache-2.0 @@ -199,6 +199,7 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen %manifest net-config.manifest %attr(500,network_fw,network_fw) %{_bindir}/* %exclude %{_bindir}/net-config.wearable +%exclude %{_bindir}/net-config-haltests %attr(644,network_fw,network_fw) %{_sysconfdir}/resolv.conf %attr(644,network_fw,network_fw) %{TZ_SYS_ETC}/resolv.conf %attr(644,root,root) %{_datadir}/dbus-1/system-services/* -- 2.34.1