unified-system-service: Change to include files in hal-api-common package by flag

Instead of separating unified-system-service files into a package, files
are included in the main package hal-api-common.
Files are included if enable_unified_system_service flag is 1, else no
unified-system-service files are included.

Change-Id: I83c139e332001b413b4f282a720b3669237bf161
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/packaging/hal-api-common.spec b/packaging/hal-api-common.spec
index 6c7bcdb5e54e92abb061fceb27fdbe165014bfc7..478fd755d430d7991f73c6db11319fe0d14976b3 100644 (file)
--- a/packaging/hal-api-common.spec
+++ b/packaging/hal-api-common.spec
@@ -28,11 +28,7 @@
 %define enable_hal_backend_service 0
 %endif
 
-%if "%{WITH_VD}" != "1" && "%{WITH_VD_MV}" != "1" && "%{WITH_DA}" != "1"
-%define enable_unified_system_service 1
-%else
 %define enable_unified_system_service 0
-%endif
 
 ### main package #########
 Name:       %{name}
@@ -88,15 +84,6 @@ Requires: hal-api-common = %{version}
 %description -n %{test_name}
 Haltests for hal-api-common
 
-%if %{enable_unified_system_service}
-### unified-system-service package #########
-%package unified-system-service
-Summary: Package for unified-system-service
-
-%description unified-system-service
-Package for unified-system-service
-%endif
-
 ### build and install #########
 %prep
 %setup -q
@@ -207,6 +194,13 @@ rm -f %{_unitdir}/sysinit.target.wants/hal-compatibility-checker.service
 %{_unitdir}/hal-backend-service*.socket
 %{_unitdir}/hal-backend-service*.service
 %endif
+%if %{enable_unified_system_service}
+%{_bindir}/unified-system-service
+%{_unitdir}/sockets.target.wants/unified-system-service.socket
+%{_unitdir}/basic.target.wants/unified-system-service.service
+%{_unitdir}/unified-system-service.socket
+%{_unitdir}/unified-system-service.service
+%endif
 
 %files -n %{devel_name}
 %defattr(-,root,root,-)
@@ -219,15 +213,3 @@ rm -f %{_unitdir}/sysinit.target.wants/hal-compatibility-checker.service
 %{_unitdir}/haltest.target
 %{_bindir}/reboot-haltest
 %{_bindir}/reboot-normal
-
-%if %{enable_unified_system_service}
-%files unified-system-service
-%license LICENSE
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_bindir}/unified-system-service
-%{_unitdir}/sockets.target.wants/unified-system-service.socket
-%{_unitdir}/basic.target.wants/unified-system-service.service
-%{_unitdir}/unified-system-service.socket
-%{_unitdir}/unified-system-service.service
-%endif