From 7c8ed64c224c7325c2d11fd4bff0b9e3d4d65a8d Mon Sep 17 00:00:00 2001
From: Lu Jingxiao <lujingxiao@huawei.com>
Date: Thu, 24 Nov 2022 20:37:19 +0800
Subject: [PATCH] isula-build: use vendor instead specific vendor name

Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com>
(cherry picked from commit 55784d2a67b661609bd8bf8f045b6e73953aff11)
---
 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 adec6ec..0000000
--- a/VERSION-openeuler
+++ /dev/null
@@ -1 +0,0 @@
-0.9.5-28
diff --git a/VERSION-vendor b/VERSION-vendor
new file mode 100644
index 0000000..2267897
--- /dev/null
+++ b/VERSION-vendor
@@ -0,0 +1 @@
+0.9.5-29
diff --git a/apply-patches b/apply-patches
index 1b64e8c..57ee922 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
 
 tar -zxvf "${tar_file}"
 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 e9278da..ab255a6 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-fe7fc24b37d8480402d75a554dfe3475a5424f89
+7620610754ea50ff5fa5908d01fc069aacdc10f3
diff --git a/isula-build.spec b/isula-build.spec
index c20d923..d408d1c 100644
--- a/isula-build.spec
+++ b/isula-build.spec
@@ -2,13 +2,13 @@
 
 Name: isula-build
 Version: 0.9.5
-Release: 28
+Release: 29
 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
+* Thu Nov 24 2022 Lu Jingxiao <lujingxiao@huawei.com> - 0.9.5-29
+- Type:bugfix
+- CVE:NA
+- SUG:restart
+- DESC:use vendor instead specific vendor name
+
 * Fri Sep 30 2022 jingxiaolu <lujingxiao@huawei.com> - 0.9.5-28
 - Type:bugfix
 - CVE:NA