From 21caa8b4988e90febaf47a708721b771fd0d1afa Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Fri, 21 Apr 2017 18:12:20 +0900 Subject: [PATCH] Remove the profiles for ivi and wearable rectangle in Unified build Change-Id: I7619f523c9674c671f09689c07c41a8e320aca25 Signed-off-by: sungwook79.park --- packaging/org.tizen.inputdelegator.spec | 182 +++----------------------------- 1 file changed, 16 insertions(+), 166 deletions(-) diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index b7033df..cd5f0f1 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -102,20 +102,6 @@ Inputdelegator binaries and resources with tv options. This is intended to support tv profiles. %endif -# This is for old profile-based OBS project optimizations. -# In 4.0 unified build env, this if statement is always true. -%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "tv" -%package profile_ivi -Summary: Inputdelegator binaries and resources with ivi profile -Provides: %{name}-compat = %{version}-%{release} -Conflicts: %{name}-profile_common -Conflicts: %{name}-profile_mobile -Conflicts: %{name}-profile_wearable -Conflicts: %{name}-profile_tv -%description profile_ivi -Inputdelegator) binaries and resources with ivi options. -This is intended to support ivi profiles. -%endif # This is for old profile-based OBS project optimizations. # In 4.0 unified build env, this if statement is always true. @@ -123,33 +109,15 @@ This is intended to support ivi profiles. # removed for unified build env later. %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "ivi" %package profile_wearable -Summary: Meta package of Inputdelegator for wearable profiles. (circle/rectangle) +Summary: Meta package of Inputdelegator for wearable profiles. Provides: %{name}-compat = %{version}-%{release} Conflicts: %{name}-profile_common Conflicts: %{name}-profile_mobile Conflicts: %{name}-profile_tv Conflicts: %{name}-profile_ivi -Requires: %{name}-profile_wearable-extension = %{version}-%{release} -Recommends: %{name}-profile_wearable-extension-circle = %{version}-%{release} %description profile_wearable Meta package of Inputdelegator binaries and resources with wearable options. - -%package profile_wearable-extension-circle -Summary: Inputdelegator binaries and resources with wearable profile (circle) -Provides: %{name}-profile_wearable-extension = %{version}-%{release} -Conflicts: %{name}-profile_wearable-extension-rectangle -%description profile_wearable-extension-circle -Inputdelegator binaries and resources with wearable options. -This is intended to support wearable profiles with circle display. - -%package profile_wearable-extension-rectangle -Summary: Inputdelegator binaries and resources with wearable profile (rectangle) -Provides: %{name}-profile_wearable-extension = %{version}-%{release} -Conflicts: %{name}-profile_wearable-extension-circle -%description profile_wearable-extension-rectangle -Inputdelegator binaries and resources with wearable options. -This is intended to support wearable profiles with rectangle display. %endif %prep @@ -168,19 +136,8 @@ rm -rf CMakeCache.txt # Common is blocked because wearable has extra efl-ext entries, which will be # removed for unified build env later. %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "ivi" -mkdir -p build_wearable_rec -pushd build_wearable_rec -export CFLAGS="${CFLAGS_BASE} -D_WEARABLE"; -export CXXFLAGS="${CXXFLAGS_BASE} -D_WEARABLE"; -%cmake .. -DTARGET=wearable \ - -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \ - -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES - -make %{?jobs:-j%jobs} -popd - -mkdir -p build_wearable_cir -pushd build_wearable_cir +mkdir -p build_wearable +pushd build_wearable export CFLAGS="${CFLAGS_BASE} -D_WEARABLE -D_CIRCLE"; export CXXFLAGS="${CXXFLAGS_BASE} -D_WEARABLE -D_CIRCLE"; %cmake .. -DTARGET=wearable \ @@ -223,20 +180,6 @@ make %{?jobs:-j%jobs} popd %endif -# This is for old profile-based OBS project optimizations. -# In 4.0 unified build env, this if statement is always true. -%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" -mkdir -p build_ivi -pushd build_ivi -export CFLAGS="${CFLAGS_BASE} -D_IVI"; -export CXXFLAGS="${CXXFLAGS_BASE} -D_IVI"; -%cmake .. -DTARGET=ivi \ - -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \ - -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES - -make %{?jobs:-j%jobs} -popd -%endif # This is for old profile-based OBS project optimizations. # In 4.0 unified build env, this if statement is always true. @@ -302,48 +245,21 @@ popd popd %endif -# This is for old profile-based OBS project optimizations. -# In 4.0 unified build env, this if statement is always true. -%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" -pushd build_ivi -%make_install -popd -mkdir -p %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/ivi -pushd %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/ -mv bin ivi/ -mkdir -p ivi/res -pushd res -for FILE in *; do if [[ $FILE =~ ^locale$ ]]; then echo skip commonly used "${FILE}"; else mv "${FILE}" ../ivi/res/; fi; done -popd -popd -%endif # This is for old profile-based OBS project optimizations. # In 4.0 unified build env, this if statement is always true. # Common is blocked because wearable has extra efl-ext entries, which will be # removed for unified build env later. %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "ivi" -pushd build_wearable_cir +pushd build_wearable %make_install popd -mkdir -p %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable-circle +mkdir -p %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable pushd %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/ -mv bin wearable-circle/ -mkdir -p wearable-circle/res +mv bin wearable/ +mkdir -p wearable/res pushd res -for FILE in *; do if [[ $FILE =~ ^locale$ ]]; then echo skip commonly used "${FILE}"; else mv "${FILE}" ../wearable-circle/res/; fi; done -popd -popd - -pushd build_wearable_rec -%make_install -popd -mkdir -p %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable-rectangle -pushd %{buildroot}%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/ -mv bin wearable-rectangle/ -mkdir -p wearable-rectangle/res -pushd res -for FILE in *; do if [[ $FILE =~ ^locale$ ]]; then echo skip commonly used "${FILE}"; else mv "${FILE}" ../wearable-rectangle/res/; fi; done +for FILE in *; do if [[ $FILE =~ ^locale$ ]]; then echo skip commonly used "${FILE}"; else mv "${FILE}" ../wearable/res/; fi; done popd popd %endif @@ -460,77 +376,11 @@ fi # This is for old profile-based OBS project optimizations. # In 4.0 unified build env, this if statement is always true. -%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" -%post profile_ivi -pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator/ivi/ -mkdir -p ../res -mkdir -p ../bin -# If we are upgrading this package, remove existing files before copying (1:install / 2:upgrade) -if [ "$1" = "2" ]; then - rm -Rf ../bin/* - pushd ../res - for FILE in *; do if [[ $FILE =~ locale$ ]]; then echo skip "${FILE}"; else rm -Rf "${FILE}"; fi; done - popd -fi -for FILE in bin/*; do ln -sf "../ivi/${FILE}" ../bin; done -for FILE in res/*; do ln -sf "../ivi/${FILE}" ../res; done -popd -%preun profile_ivi -# Perform file removal only when uninstalling (0:uninstall / 1:upgrade) -if [ "$1" = "0" ]; then - pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator - rm -Rf bin - pushd res - for FILE in *; do if [[ $FILE =~ locale$ ]]; then echo skip "${FILE}"; else rm -Rf "${FILE}"; fi; done - popd - popd -fi -%files profile_ivi -%manifest %{name}.manifest -%defattr(-,root,root,-) -%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/ivi/* -%endif - - -# This is for old profile-based OBS project optimizations. -# In 4.0 unified build env, this if statement is always true. # Common is blocked because wearable has extra efl-ext entries, which will be # removed for unified build env later. %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "ivi" -%files profile_wearable - -%post profile_wearable-extension-circle -pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable-circle/ -mkdir -p ../res -mkdir -p ../bin -# If we are upgrading this package, remove existing files before copying (1:install / 2:upgrade) -if [ "$1" = "2" ]; then - rm -Rf ../bin/* - pushd ../res - for FILE in *; do if [[ $FILE =~ locale$ ]]; then echo skip "${FILE}"; else rm -Rf "${FILE}"; fi; done - popd -fi -for FILE in bin/*; do ln -sf "../wearable-circle/${FILE}" ../bin; done -for FILE in res/*; do ln -sf "../wearable-circle/${FILE}" ../res; done -popd -%preun profile_wearable-extension-circle -# Perform file removal only when uninstalling (0:uninstall / 1:upgrade) -if [ "$1" = "0" ]; then - pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator - rm -Rf bin - pushd res - for FILE in *; do if [[ $FILE =~ locale$ ]]; then echo skip "${FILE}"; else rm -Rf "${FILE}"; fi; done - popd - popd -fi -%files profile_wearable-extension-circle -%manifest %{name}.manifest -%defattr(-,root,root,-) -%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable-circle/* - - -%post profile_wearable-extension-rectangle -pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable-rectangle/ +%post profile_wearable +pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable/ mkdir -p ../res mkdir -p ../bin # If we are upgrading this package, remove existing files before copying (1:install / 2:upgrade) @@ -540,10 +390,10 @@ if [ "$1" = "2" ]; then for FILE in *; do if [[ $FILE =~ locale$ ]]; then echo skip "${FILE}"; else rm -Rf "${FILE}"; fi; done popd fi -for FILE in bin/*; do ln -sf "../wearable-rectangle/${FILE}" ../bin; done -for FILE in res/*; do ln -sf "../wearable-rectangle/${FILE}" ../res; done +for FILE in bin/*; do ln -sf "../wearable/${FILE}" ../bin; done +for FILE in res/*; do ln -sf "../wearable/${FILE}" ../res; done popd -%preun profile_wearable-extension-rectangle +%preun profile_wearable # Perform file removal only when uninstalling (0:uninstall / 1:upgrade) if [ "$1" = "0" ]; then pushd %{TZ_SYS_RO_APP}/org.tizen.inputdelegator @@ -553,8 +403,8 @@ if [ "$1" = "0" ]; then popd popd fi -%files profile_wearable-extension-rectangle +%files profile_wearable %manifest %{name}.manifest %defattr(-,root,root,-) -%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable-rectangle/* -%endif +%{TZ_SYS_RO_APP}/org.tizen.inputdelegator/wearable/* +%endif \ No newline at end of file -- 2.7.4