From 299641594a8040362e6b3f2d7f2b2037047ba86f Mon Sep 17 00:00:00 2001 From: Youngsoo Choi Date: Fri, 28 Aug 2020 00:04:06 -0700 Subject: [PATCH] fixup! [UWE] Notify internal API compatibility when installing rpm This ignores chromium-efl-squashfs for checking chromium-efl revision. Change-Id: Ifdd2611495b869b2c8273e43c13dbf4085e35861 Signed-off-by: Youngsoo Choi --- packaging/wrtjs.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/wrtjs.spec b/packaging/wrtjs.spec index d97c6c3..60d3290 100755 --- a/packaging/wrtjs.spec +++ b/packaging/wrtjs.spec @@ -160,15 +160,15 @@ cp -r %{app_dir}/* %{buildroot}%{_resourcedir}/ %endif %pre -if (( $(rpm -qa | grep 'chromium-efl-[[:digit:]]' | wc -l) > 1 )); then +if (( $(rpm -q chromium-efl | wc -l) > 1 )); then echo -e "\033[31m*****************************************************" echo -e "Please remove chromium-efl rpm(s) except for one:\n" - rpm -qa | grep 'chromium-efl-[[:digit:]]' + rpm -q chromium-efl echo -e "*****************************************************\033[m" exit 1 fi -export CHROMIUM_REVISION=$(rpm -qa | grep chromium-efl | awk -F. '{print $2}') +export CHROMIUM_REVISION=$(rpm -q chromium-efl | awk -F. '{print $2}') export WRTJS_REVISION=$(echo %{version} | awk -F. '{print $2}') if [[ "${CHROMIUM_REVISION}" == "" ]]; then CHROMIUM_REVISION="not installed" -- 2.7.4