From 95e1d9b62cd296756fbff398756ea06f7fac0fe8 Mon Sep 17 00:00:00 2001
From: DCCooper <1866858@gmail.com>
Date: Thu, 14 Oct 2021 10:18:55 +0800
Subject: [PATCH] isula-build:use pre instead of pretrans for groupadd

reason: mv groupadd from pretrans to pre to prevent install failed when
doing: `yum install -y isula-build --installroot /root/test`. This could
fail because there is no **sh** command then.
%Pretrans will run the script before any package installed, so it is not
proper to do `groupadd` in the Pretrans step.

Signed-off-by: DCCooper <1866858@gmail.com>
---
 VERSION-openeuler |  2 +-
 git-commit        |  2 +-
 isula-build.spec  | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/VERSION-openeuler b/VERSION-openeuler
index 500b4f0..9ae7772 100644
--- a/VERSION-openeuler
+++ b/VERSION-openeuler
@@ -1 +1 @@
-0.9.5-12
+0.9.5-13
diff --git a/git-commit b/git-commit
index 765fbe8..febcde7 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-9d87e2bf8f9cdced75d00a2931d98acba35fd355
+8742b763287fdb565d6044154318a2447bad171f
diff --git a/isula-build.spec b/isula-build.spec
index 1e25032..820a0b3 100644
--- a/isula-build.spec
+++ b/isula-build.spec
@@ -2,7 +2,7 @@
 
 Name: isula-build
 Version: 0.9.5
-Release: 12
+Release: 13
 Summary: A tool to build container images
 License: Mulan PSL V2
 URL: https://gitee.com/openeuler/isula-build
@@ -63,7 +63,7 @@ install -p -m 600 __isula-build %{buildroot}/usr/share/bash-completion/completio
 %clean
 rm -rf %{buildroot}
 
-%pretrans
+%pre
 if ! getent group isula > /dev/null; then
     groupadd --system isula
 fi
@@ -85,6 +85,12 @@ fi
 /usr/share/bash-completion/completions/isula-build
 
 %changelog
+* Thu Oct 14 2021 DCCooper <1866858@gmail.com> - 0.9.5-13
+- Type:bugfix
+- CVE:NA
+- SUG:restart
+- DESC:use pre instead of pretrans for groupadd
+
 * Fri Sep 03 2021 xingweizheng <xingweizheng@huawei.com> - 0.9.5-12
 - Type:bugfix
 - CVE:NA