change recovery gui binary name in spec file and remove swp file

- change 'recovery_gui' to 'system-recovery_gui' in spec file for matching with execution script
- remove swp file not used

Change-Id: If34ee188e148939ed101720a2eec0b325ed1778d

diff --git a/42-tota-gui-common.list b/42-tota-gui-common.list
index bf921399fd136a7f54d9ca099c3483b1437d65d5..1b2cbcfbab2838836c9372a6ff2f438a892a760b 100644 (file)
--- a/42-tota-gui-common.list
+++ b/42-tota-gui-common.list
@@ -120,7 +120,7 @@ VERBATIMS="
 
 WITHLIBS="
 /usr/bin/fota_gui
-/usr/bin/recovery_gui
+/usr/bin/system-recovery_gui
 /usr/lib/tdm/libtdm-default.so
 /usr/lib/bufmgr/libtbm_default.so
 "

diff --git a/packaging/firmware-update-system-ui.spec b/packaging/firmware-update-system-ui.spec
index aeff6768ed30a64474d8a75c798670efaf40b8a7..3f9b5fa4e0ce71112102fb04c81e725d55ac887e 100644 (file)
--- a/packaging/firmware-update-system-ui.spec
+++ b/packaging/firmware-update-system-ui.spec
@@ -64,11 +64,11 @@ mv %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui-wearable.list %{_datadi
 %post common
 mv %{_bindir}/fota_gui_common %{_bindir}/fota_gui
 mv %{_bindir}/rw-update-ani-common %{_bindir}/rw-update-ani
+mv %{_bindir}/recovery_gui_common %{_bindir}/system-recovery_gui
 mkdir -p %{_datadir}/res
 mv %{_datadir}/fota/res/images_common/images %{_datadir}/res/images
 mv %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui-common.list %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui.list
 
-mv %{_bindir}/recovery_gui_common %{_bindir}/recovery_gui
 
 %preun wearable
 mv %{_bindir}/fota_gui %{_bindir}/fota_gui_wearable
@@ -80,10 +80,10 @@ mv %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui.list %{_datadir}/initrd
 %preun common
 mv %{_bindir}/fota_gui %{_bindir}/fota_gui_common
 mv %{_bindir}/rw-update-ani %{_bindir}/rw-update-ani-common
+mv %{_bindir}/system-recovery_gui %{_bindir}/recovery_gui_common
 mv %{_datadir}/res/images %{_datadir}/fota/res/images_common
 mv %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui.list %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui-common.list
 
-mv %{_bindir}/recovery_gui %{_bindir}/recovery_gui_common
 
 %files
 %license LICENSE.APLv2
@@ -107,5 +107,5 @@ mv %{_bindir}/recovery_gui %{_bindir}/recovery_gui_common
 %attr(700,-,-) %{_datadir}/initrd-recovery/initrd.list.d/42-tota-gui-common.list
 %{_datadir}/fota/res/images_common
 %{_bindir}/fota_gui_common
-%attr(550,system,system_share) %{_bindir}/rw-update-ani-common
 %{_bindir}/recovery_gui_common
+%attr(550,system,system_share) %{_bindir}/rw-update-ani-common

diff --git a/recovery_gui_common/.CMakeLists.txt.swp b/recovery_gui_common/.CMakeLists.txt.swp
deleted file mode 100644 (file)
index f924d34..0000000
Binary files a/recovery_gui_common/.CMakeLists.txt.swp and /dev/null differ