From f326f7046fb88f4916495d8590d2ac8488ff5e6b Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Fri, 9 Feb 2018 13:39:11 +0900 Subject: [PATCH] [Build] Remove dali native version check from rpm spec (#118) --- packaging/csapi-tizenfx.spec.in | 6 ------ packaging/makespec.sh | 5 ----- packaging/version.txt | 3 --- 3 files changed, 14 deletions(-) diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in index c35e778..7b9509d 100644 --- a/packaging/csapi-tizenfx.spec.in +++ b/packaging/csapi-tizenfx.spec.in @@ -3,8 +3,6 @@ %define TIZEN_NET_RPM_VERSION @rpm_version@ %define TIZEN_NET_NUGET_VERSION @nuget_version@ %define TIZEN_NET_INTERNAL_NUGET_VERSION @internal_nuget_version@ -%define NATIVE_DALI_VERSION @dali_version@ -%define CHECK_NATIVE_DEPS @check_native_deps@ %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref @@ -28,10 +26,6 @@ AutoReqProv: no BuildRequires: dotnet-build-tools Requires(post): /usr/bin/vconftool -%if 0%{CHECK_NATIVE_DEPS} -BuildRequires: dali = %{NATIVE_DALI_VERSION} -%endif - %description %{summary} diff --git a/packaging/makespec.sh b/packaging/makespec.sh index 0c19cb6..69f3d9b 100755 --- a/packaging/makespec.sh +++ b/packaging/makespec.sh @@ -7,8 +7,6 @@ VERSION_FILE=$SCRIPT_DIR/version.txt RPMSPEC=$SCRIPT_DIR/csapi-tizenfx.spec RPMSPEC_IN=$RPMSPEC.in -CHECK_NATIVE_DEPS=0 - source $VERSION_FILE while getopts ":r:n:i:c:" opt; do @@ -16,7 +14,6 @@ while getopts ":r:n:i:c:" opt; do r) RPM_VERSION=$OPTARG ;; n) NUGET_VERSION=$OPTARG ;; i) INTERNAL_NUGET_VERSION=$OPTARG ;; - c) CHECK_NATIVE_DEPS=$OPTARG ;; :) echo "Option -$OPTARG requires an argument."; exit 1 ;; esac done @@ -29,5 +26,3 @@ sed -i -e "s/@api_version@/$API_VERSION/g" $RPMSPEC sed -i -e "s/@rpm_version@/$RPM_VERSION/g" $RPMSPEC sed -i -e "s/@nuget_version@/$NUGET_VERSION/g" $RPMSPEC sed -i -e "s/@internal_nuget_version@/$INTERNAL_NUGET_VERSION/g" $RPMSPEC -sed -i -e "s/@dali_version@/$DALI_VERSION/g" $RPMSPEC -sed -i -e "s/@check_native_deps@/$CHECK_NATIVE_DEPS/g" $RPMSPEC diff --git a/packaging/version.txt b/packaging/version.txt index eb4e0a4..21b0bc7 100755 --- a/packaging/version.txt +++ b/packaging/version.txt @@ -8,6 +8,3 @@ INTERNAL_NUGET_VERSION=4.0.1.999 # RPM Version Suffix RPM_VERSION_SUFFIX=nui401 - -# Native Dependencies -DALI_VERSION=0 -- 2.7.4