From 461c668745951947c66afdcf05bdd4256bd8f9cb Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Thu, 12 Jul 2018 11:57:54 +0900 Subject: [PATCH] Remove unsupported ivi profile Change-Id: I49142f5ae3b5f4e9c068def4cb7a5d1ef06f016d Signed-off-by: lokilee73 --- packaging/system-servant.spec | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec index 026ee4a..9615881 100755 --- a/packaging/system-servant.spec +++ b/packaging/system-servant.spec @@ -56,19 +56,7 @@ Conflicts: system-servant-extension-profile_ivi Conflicts: system-servant-extension-profile_tv %description profile_common System-popup (system-servant) configured for common profile. -The binary is shared between common/ivi/tv. - -%package profile_ivi -Summary: System-servant configured for common profile -Provides: system-servant-compat = %{version}-%{release} -Conflicts: system-servant-profile_mobile -Conflicts: system-servant-extension-rectangle-profile_wearable -Conflicts: system-servant-extension-circle-profile_wearable -Conflicts: system-servant-profile_common -Conflicts: system-servant-extension-profile_tv -%description profile_ivi -System-popup (system-servant) configured for IVI profile. -The binary is shared between common/ivi/tv. +The binary is shared between common/tv. %package profile_tv Summary: System-servant configured for TV profile @@ -81,7 +69,7 @@ Conflicts: system-servant-profile_common Conflicts: system-servant-extension-profile_ivi %description profile_tv System-popup (system-servant) configured for TV profile. -The binary is shared between common/ivi/tv. +The binary is shared between common/tv. %package profile_mobile Summary: System-servant configured for mobile profile @@ -100,7 +88,7 @@ Conflicts: system-servant-extension-profile_tv System-popup (system-servant) configured for mobile profile. # Because of CAPI incompatibility from EFL-EXT, circle is buildable only for wearable and "unified (undefined)" -%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common" +%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="common" %package extension-circle-profile_wearable Summary: System-servant configured for wearable profile Provides: system-servant-compat = %{version}-%{release} @@ -276,7 +264,7 @@ ls -la profile_mobile/%{TZ_SYS_RO_SHARE}/system-apps/res/icons ls -la profile_mobile/%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res # Because of CAPI incompatibility from EFL-EXT, wearable is buildable only for wearable and "unified (undefined)" -%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common" +%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="common" # BUILD WEARABLE mkdir -p build_rec_wearable pushd build_rec_wearable @@ -347,7 +335,7 @@ mv %{buildroot}/%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/cooldown-p mv %{buildroot}/%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/res/overheat.png cir-profile_wearable/res/ %endif -# BUILD COMMON/TV/IVI +# BUILD COMMON/TV mkdir -p build_common pushd build_common %cmake .. \ @@ -396,7 +384,7 @@ install -m 0644 profile_mobile/%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/ install -m 0644 profile_mobile/%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/core_restart.png %{buildroot}/%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/core_restart.png # Because of CAPI incompatibility from EFL-EXT, wearable is buildable only for wearable and "unified (undefined)" -%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common" +%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="common" mkdir -p %{buildroot}/%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res mkdir -p %{buildroot}/%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/res install -m 0644 rec-profile_wearable/shared/res/*.edj %{buildroot}/%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/ @@ -428,7 +416,7 @@ mv /%{_bindir}/sysapp-launcher.mobile /%{_bindir}/sysapp-launcher mv /%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/bin/system-syspopup.mobile /%{TZ_SYS_RO_APP}/org.tizen.system-syspopup/bin/system-syspopup # Because of CAPI incompatibility from EFL-EXT, circle is buildable only for wearable and "unified (undefined)" -%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common" +%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="common" %post extension-circle-profile_wearable # This does not support proper uninstall. To uninstall profile_wearable-circle with # correct system-servant kept, you need to reinstall system-servant after @@ -540,7 +528,7 @@ mv /%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup.wearable /%{ %{_datadir}/system-apps/res/icons/usb_icon.png # Because of CAPI incompatibility from EFL-EXT, wearable is buildable only for wearable and "unified (undefined)" -%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common" +%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="common" %files extension-circle-profile_wearable %license LICENSE.Apache-2.0 %defattr(-,root,root,-) @@ -575,7 +563,7 @@ mv /%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup.wearable /%{ %{TZ_SYS_RO_SHARE}/packages/org.tizen.system-syspopup.xml # Because of CAPI incompatibility from EFL-EXT, wearable is buildable only for wearable and "unified (undefined)" -%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common" +%if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="common" %files -n org.tizen.system-syspopup.wearable %manifest org.tizen.system-syspopup.manifest %license LICENSE.Apache-2.0 @@ -623,4 +611,3 @@ mv /%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup.wearable /%{ # The followings are meta packages to keep the compatibility with conventional profiles. %files profile_tv -%files profile_ivi -- 2.7.4