Clean up rpm sub spec.in

Improve readability of RPM spec and ignore error during
installing/uninstalling chromium-efl-browser package.

Change-Id: Id1dba35ba95d8c9d817af9669f4d80249a3fb6b6
Signed-off-by: Insoon Kim <is46.kim@samsung.com>

diff --git a/packaging/chromium-efl-browser.spec.in b/packaging/chromium-efl-browser.spec.in
index 60fff9ad6d6f319f3c720c212bc99d66084fd973..a2bf5456d18753ea61902955d6c061802e117c66 100644 (file)
--- a/packaging/chromium-efl-browser.spec.in
+++ b/packaging/chromium-efl-browser.spec.in
@@ -1,32 +1,36 @@
 %package browser
 Summary: Tizen Chromium Browser Application
 Requires: %{name} = %{version}-%{release}
+
+
 %description browser
 Tizen Chromium Browser Application on Chromium EFL
-# org.tizen.chromium-efl-browser
 
+
+# Sub spec variables
 %define _browser_pkgid %{_pkgid}-browser
 %define _browser_rootdir  %{TZ_SYS_RO_APP}/%{_browser_pkgid}
 %define _browser_buildpath "%{buildroot}"%{_browser_rootdir}
 
 # This variable is being accessed in the parent spec file, so we define it globally here.
-%global __browser_install_spec \
-  install -m 0644 "%{OUTPUT_FOLDER}"/tizen-manifest-browser.xml "%{buildroot}"%{_xmldir}/%{_browser_pkgid}.xml \
-  install -d "%{_browser_buildpath}" \
-  install -d "%{_browser_buildpath}"/bin \
-  install -d "%{_browser_buildpath}"/bin/locales \
-  install -d "%{_browser_buildpath}"/shared/res \
-  install -m 0755 "%{OUTPUT_FOLDER}"/chrome_tizen             "%{_browser_buildpath}"/bin \
-  install -m 0644 "%{OUTPUT_FOLDER}"/chrome_100_percent.pak   "%{_browser_buildpath}"/bin \
-  install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak            "%{_browser_buildpath}"/bin \
-  install -m 0644 "%{OUTPUT_FOLDER}"/locales/en-US.pak        "%{_browser_buildpath}"/bin/locales \
-  install -m 0644 "%{OUTPUT_FOLDER}"/snapshot_blob.bin        "%{_browser_buildpath}"/bin \
-  install -m 0644 "%{OUTPUT_FOLDER}"/product_logo_48.png      "%{_browser_buildpath}"/shared/res/%{_browser_pkgid}.png \
-  %{nil}
-
-%global __install_spec_third_party_icu \
-  install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat               "%{_browser_buildpath}"/bin \
-%{nil}
+%global __browser_install_spec %{expand:
+  install -m 0644 "%{OUTPUT_FOLDER}"/tizen-manifest-browser.xml "%{buildroot}"%{_xmldir}/%{_browser_pkgid}.xml
+  install -d "%{_browser_buildpath}"
+  install -d "%{_browser_buildpath}"/bin
+  install -d "%{_browser_buildpath}"/bin/locales
+  install -d "%{_browser_buildpath}"/shared/res
+  install -m 0755 "%{OUTPUT_FOLDER}"/chrome_tizen             "%{_browser_buildpath}"/bin
+  install -m 0644 "%{OUTPUT_FOLDER}"/chrome_100_percent.pak   "%{_browser_buildpath}"/bin
+  install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak            "%{_browser_buildpath}"/bin
+  install -m 0644 "%{OUTPUT_FOLDER}"/locales/en-US.pak        "%{_browser_buildpath}"/bin/locales
+  install -m 0644 "%{OUTPUT_FOLDER}"/snapshot_blob.bin        "%{_browser_buildpath}"/bin
+  install -m 0644 "%{OUTPUT_FOLDER}"/product_logo_48.png      "%{_browser_buildpath}"/shared/res/%{_browser_pkgid}.png
+
+%if !0%{?__use_system_icu}
+  install -m 0644 "%{OUTPUT_FOLDER}"/icudtl.dat  "%{_browser_buildpath}"/bin
+%endif
+}
+
 
 %files browser
 %manifest packaging/chromium-efl.manifest
@@ -37,16 +41,20 @@ Tizen Chromium Browser Application on Chromium EFL
 %{_browser_rootdir}/bin/locales/en-US.pak
 %{_browser_rootdir}/bin/snapshot_blob.bin
 %{_browser_rootdir}/shared/res/%{_browser_pkgid}.png
-%if "%{?__use_system_icu}" != "1"
+%if !0%{?__use_system_icu}
 %{_browser_rootdir}/bin/icudtl.dat
 %endif
 
+
 %preun browser
 echo Uninstall %{_browser_pkgid}
-tpk-backend -d %{_browser_pkgid} --preload
+tpk-backend -d %{_browser_pkgid} --preload --force-remove || true
+
 
 %pre browser
 
+
 %post browser
 echo Install %{_browser_pkgid}
-tpk-backend -y %{_browser_pkgid} --preload
+echo tpk-backend -y %{_browser_pkgid} --preload
+tpk-backend -y %{_browser_pkgid} --preload || true

diff --git a/packaging/chromium-efl-engine.spec.in b/packaging/chromium-efl-engine.spec.in
index 19d238ff4b6d5469083548e54eb19dfd41f389a8..3ea022bde3b8b06f29e4c04199a4a618a83bbed0 100644 (file)
--- a/packaging/chromium-efl-engine.spec.in
+++ b/packaging/chromium-efl-engine.spec.in
@@ -2,11 +2,15 @@
 Summary: Tizen Chromium Engine Libary for UWE
 Requires: %{name}
 
+
 %description engine
 This package contains only /usr/share/chromium-efl required for UWE
 
+
+# Sub spec variables
 %define _engine_root_dir %{CHROMIUM_LIB_DIR}
 
+
 %files engine
 %manifest packaging/chromium-efl.manifest
 %{_engine_root_dir}/version
@@ -18,17 +22,20 @@ This package contains only /usr/share/chromium-efl required for UWE
 # locale resources
 %{_engine_root_dir}/bin/locales/en-US.pak
 %{_engine_root_dir}/res/locale/en_US
-%if "%{?__use_system_icu}" != "1"
-  %{_engine_root_dir}/bin/icudtl.dat
+%if !0%{?__use_system_icu}
+%{_engine_root_dir}/bin/icudtl.dat
 %endif
 %if 0%{?__enable_wrt_js}
-  %{_engine_root_dir}/bin/wrt_resources.pak
+%{_engine_root_dir}/bin/wrt_resources.pak
 %endif
 
+
 %preun engine
 
+
 %pre engine
 # Remove old files
 rm -rf %{_engine_root_dir}/*
 
+
 %post engine

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index d408a8f52038096b8ae20b43ed012f94d3972a23..02b7d12bad965640d58b670f6f6bbb4f057cb713 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -674,11 +674,10 @@ Chromium Tizen V8 unittests
 %define _tpkid %{_pkgid}
 %endif
 
+# Include sub spec.in
 %define include_sub_spec() %{expand:%(cat '%{1}')}
 %{include_sub_spec %{SOURCE2}}
-
 %if 0%{?__build_chrome}
-%define include_sub_spec() %{expand:%(cat '%{1}')}
 %{include_sub_spec %{SOURCE3}}
 %endif
 
@@ -1084,6 +1083,11 @@ sed -e 's#@RW_APP_PATH@#%{TZ_SYS_RW_APP}/%{_pkgid}#g' \
     tizen_src/downloadable/systemd/chromium-efl-update.service.in \
     > "%{OUTPUT_FOLDER}"/chromium-efl-update.service
 %endif
+
+# Print libchromium-impl.so size
+ls -l "%{OUTPUT_FOLDER}"/libchromium-impl.so
+size -G "%{OUTPUT_FOLDER}"/libchromium-impl.so
+
 %install
 
 mkdir -p %{buildroot}%{_datadir}/upgrade/vd_scripts/additional_scripts
@@ -1460,23 +1464,16 @@ tar -cj -f "%{buildroot}"%{TIZEN_V8_UT_DIR}/v8-test-data.tar.bz2 v8/tools/ v8/te
   install -m 0644 wrt/native_wrtjs.d.ts                           %{buildroot}%{_includedir}/wrt/
 %endif
 
-%if 0%{?__strip_all}
-  echo "Strip all symbols from all libraries in chromium-efl rpm package"
-  find %{buildroot} -type f -name *.so | xargs strip --strip-all
-%endif
-
-# Print libchromium-impl.so size
-#ls -l "%{buildroot}%{CHROMIUM_LIB_DIR}/lib/libchromium-impl.so"
-#size -G "%{buildroot}%{CHROMIUM_LIB_DIR}/lib/libchromium-impl.so"
-
 %if 0%{?__build_chrome}
   %{__browser_install_spec}
-%if "%{?__use_system_icu}" != "1"
-  %{__install_spec_third_party_icu}
-%endif
   # tizen_src/build/build_chromium_browser_tpk.sh %{_buildroot_next_browser} %{OUTPUT_FOLDER} %{_browser_tpk_file_name} %{__browser_tpk_id} %{?profile}
 %endif
 
+%if 0%{?__strip_all}
+  echo "Strip all symbols from all libraries in chromium-efl rpm package"
+  find %{buildroot} -type f -name *.so | xargs strip --strip-all
+%endif
+
 %pre
 if (( $(rpm -qa | grep 'wrtjs-[[:digit:]]' | wc -l) > 1 )); then
   echo -e "\033[31m*****************************************************"