From 047ff6975708c8962f7c3b5228ff77be55418af1 Mon Sep 17 00:00:00 2001
From: DCCooper <1866858@gmail.com>
Date: Wed, 23 Nov 2022 17:34:41 +0800
Subject: [PATCH] isula-build: use vendor instead specific vendor name

Signed-off-by: DCCooper <1866858@gmail.com>
---
 VERSION-openeuler |  1 -
 VERSION-vendor    |  1 +
 apply-patches     |  4 ++--
 gen-version.sh    |  2 +-
 git-commit        |  2 +-
 isula-build.spec  | 10 ++++++++--
 6 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 VERSION-openeuler
 create mode 100644 VERSION-vendor

diff --git a/VERSION-openeuler b/VERSION-openeuler
deleted file mode 100644
index c572154..0000000
--- a/VERSION-openeuler
+++ /dev/null
@@ -1 +0,0 @@
-0.9.6-13
diff --git a/VERSION-vendor b/VERSION-vendor
new file mode 100644
index 0000000..f523c77
--- /dev/null
+++ b/VERSION-vendor
@@ -0,0 +1 @@
+0.9.6-14
diff --git a/apply-patches b/apply-patches
index 24cfdd8..88d8c7f 100755
--- a/apply-patches
+++ b/apply-patches
@@ -9,7 +9,7 @@ set -ex
 pkg=isula-build
 cwd=${PWD}
 src=${cwd}/${pkg}
-tar_file=v"$(awk -F"-" '{print $1}' <VERSION-openeuler)".tar.gz
+tar_file=v"$(awk -F"-" '{print $1}' <VERSION-vendor)".tar.gz
 
 mkdir ${src} && tar -zxvf "${tar_file}" -C ${src} --strip-components 1
 if [ ! -d patch ]; then
@@ -35,5 +35,5 @@ done <"${series}"
 cd "${cwd}"
 
 cp -rf "${src}"/* .
-cp -f VERSION-openeuler VERSION
+cp -f VERSION-vendor VERSION
 rm -rf "${src}"
diff --git a/gen-version.sh b/gen-version.sh
index 9ec6d3e..ec6ba21 100755
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -16,7 +16,7 @@
 
 # Basic info
 top_dir=$(git rev-parse --show-toplevel)
-version_file="${top_dir}/VERSION-openeuler"
+version_file="${top_dir}/VERSION-vendor"
 spec_file="${top_dir}/isula-build.spec"
 commit_file=${top_dir}/git-commit
 color=$(tput setaf 2) # red
diff --git a/git-commit b/git-commit
index 50cbfae..71bfd16 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-de59790370c6bb31408c4317e7dd71d1436fbece
+e4b5a3bee5a69df32fb60b5eb8c28e1e8a39b59b
diff --git a/isula-build.spec b/isula-build.spec
index 651b201..d699f30 100644
--- a/isula-build.spec
+++ b/isula-build.spec
@@ -2,13 +2,13 @@
 
 Name: isula-build
 Version: 0.9.6
-Release: 13
+Release: 14
 Summary: A tool to build container images
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/isula-build
 Source0: https://gitee.com/openeuler/isula-build/repository/archive/v%{version}.tar.gz
 Source1: git-commit
-Source2: VERSION-openeuler
+Source2: VERSION-vendor
 Source3: apply-patches
 Source4: gen-version.sh
 Source5: series.conf
@@ -85,6 +85,12 @@ fi
 /usr/share/bash-completion/completions/isula-build
 
 %changelog
+* Wed Nov 23 2022 Lixiang <cooper.li@huawei.com> - 0.9.6-14
+- Type:bugfix
+- CVE:NA
+- SUG:restart
+- DESC:use vendor instead specific vendor name
+
 * Tue Nov 01 2022 daisicheng <daisicheng@huawei.com> - 0.9.6-13
 - Type:bugfix
 - CVE:NA