Integrate config-enable-display-timer rpm into mobile profile, and fix conf files

Change-Id: I31f7cc6eb5577e92d1668eb43a45779cf0b6f929
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f08ee01..d55168c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,8 +234,8 @@ ENDIF()
 
 IF(DISPLAY_MODULE STREQUAL on)
        INSTALL_CONF(conf display)
-       INSTALL_CONF(conf display-enable-timer)
-       INSTALL_CONF(conf profile-wearable)
+       INSTALL_CONF(conf mobile-display)
+       INSTALL_CONF(conf wearable-display)
 ENDIF()
 
 IF(POWER_MODULE STREQUAL on)

diff --git a/conf/display-enable-timer.conf b/conf/mobile-display.conf
similarity index 100%
rename from conf/display-enable-timer.conf
rename to conf/mobile-display.conf

diff --git a/conf/profile-wearable.conf b/conf/wearable-display.conf
similarity index 100%
rename from conf/profile-wearable.conf
rename to conf/wearable-display.conf

diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index c0c3365..b92bd02 100755 (executable)
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -82,14 +82,6 @@ Group:      System/Utilities
 Deviced helper programs.
 This package can be installed optional for auto dbus test.
 
-%package config-enable-display-timer
-Summary:    Configuration files for display
-Group:      System/Management
-BuildArch:  noarch
-
-%description config-enable-display-timer
-This package is used for enabling a display timer.
-
 %package plugin-profile-mobile
 Summary:    Plugin libraries for mobile devices
 Group:      System/Management
@@ -203,17 +195,15 @@ fi
 
 %postun -n libdeviced -p /sbin/ldconfig
 
-%post config-enable-display-timer
-cat %{_sysconfdir}/deviced/display-enable-timer.conf >> %{_sysconfdir}/deviced/display.conf
-rm -rf %{_sysconfdir}/deviced/display-enable-timer.conf
-
 %post plugin-profile-mobile
+cat %{_sysconfdir}/deviced/mobile-display.conf >> %{_sysconfdir}/deviced/display.conf
+rm -rf %{_sysconfdir}/deviced/mobile-display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/mobile-display.so %{_libdir}/deviced/display.so
 
 %post plugin-profile-wearable
-cat %{_sysconfdir}/deviced/profile-wearable.conf >> %{_sysconfdir}/deviced/wearable.conf
-rm -rf %{_sysconfdir}/deviced/profile-wearable.conf
+cat %{_sysconfdir}/deviced/wearable-display.conf >> %{_sysconfdir}/deviced/display.conf
+rm -rf %{_sysconfdir}/deviced/wearable-display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/wearable-display.so %{_libdir}/deviced/display.so
 
@@ -276,21 +266,18 @@ mv %{_libdir}/iot-display.so %{_libdir}/deviced/display.so
 %{_bindir}/deviced-auto-test
 %config %{_sysconfdir}/deviced/auto-test.conf
 
-%files config-enable-display-timer
-%manifest deviced.manifest
-%license LICENSE.Apache-2.0
-%config %{_sysconfdir}/deviced/display-enable-timer.conf
-
 %files plugin-profile-mobile
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
+%config %{_sysconfdir}/deviced/mobile-display.conf
 %{_libdir}/mobile-display.so
 
 %files plugin-profile-wearable
 %manifest deviced.manifest
 %license LICENSE.Apache-2.0
-%config %{_sysconfdir}/deviced/profile-wearable.conf
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/deviced/wearable-display.conf
 %{_libdir}/wearable-display.so
 
 %files plugin-profile-tv