!18 Update to 20230809

From: @wk333 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge

0001-add-settings.patch

@@ -0,0 +1,44 @@
+From 81bfa0fb035176127c82b186c9eddbd47e9de76c Mon Sep 17 00:00:00 2001
+From: miao_kaibo <miaokaibo@outlook.com>
+Date: Thu, 7 Jan 2021 09:48:09 +0800
+Subject: [PATCH] add settings
+
+---
+ build        |  3 +++
+ settings.xml | 10 ++++++++++
+ 2 files changed, 13 insertions(+)
+ create mode 100644 settings.xml
+
+diff --git a/build b/build
+index 9b2d0f2..5f7bb19 100755
+--- a/build
++++ b/build
+@@ -1357,6 +1357,9 @@ for RECIPEFILE in "${RECIPEFILES[@]}" ; do
+ 	if test -f $BUILD_ROOT/etc/gshadow ; then
+ 	    sed -i -e "s@^root::@root:*:@" $BUILD_ROOT/etc/gshadow
+ 	fi
++    mkdir -p $BUILD_ROOT/home/abuild/.m2
++    chown $ABUILD_UID:$ABUILD_GID $BUILD_ROOT/home/abuild/.m2
++    cp $BUILD_DIR/settings.xml $BUILD_ROOT/home/abuild/.m2/
+ 	BUILD_USER_ABUILD_USED=true
+     else
+ 	# building as root
+diff --git a/settings.xml b/settings.xml
+new file mode 100644
+index 0000000..99a806f
+--- /dev/null
++++ b/settings.xml
+@@ -0,0 +1,10 @@
++<settings>
++    <mirrors>
++        <mirror>
++            <id>huaweicloud</id>
++            <name>huaweicloud</name>
++            <mirrorOf>*</mirrorOf>
++            <url>https://mirrors.huaweicloud.com/repository/maven/</url>
++        </mirror>
++    </mirrors>
++</settings>
+-- 
+2.27.0
+

0001-modify-for-obs-build.patch

@@ -1,29 +0,0 @@
-From 2372a1ac834d17d99899275685606f5ebb15f265 Mon Sep 17 00:00:00 2001
-From: jeff200902 <jeff200902@163.com>
-Date: Mon, 27 Jul 2020 18:59:20 +0800
-Subject: [PATCH] modify for osb build
-
----
- build | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/build b/build
-index 9b2d0f2..df9ce59 100755
---- a/build
-+++ b/build
-@@ -1549,6 +1549,12 @@ if test \( -n "$RPMS" -o -n "$DEBS" \) -a -n "$CREATE_BASELIBS"; then
-     create_baselibs
- fi
- 
-+if test -f "$BUILD_ROOT/etc/resolv.conf"; then
-+    cat $BUILD_ROOT/etc/resolv.conf
-+else
-+    cp /etc/resolv.conf $BUILD_ROOT/etc/
-+fi
-+
- exitcode=0
- 
- # post build work
--- 
-2.23.0
-

obs-build.spec

@@ -1,14 +1,14 @@
 Name:           build
-Version:        20191114
+Version:        20230809
-Release:        324.4
+Release:        1
 Summary:        A tool to build binary packages
 License:        GPL-2.0-only OR GPL-3.0-only
 Url:            https://github.com/openSUSE/obs-build
-Source:         obs-build-%{version}.tar.gz
+Source:         https://github.com/openSUSE/obs-build/archive/refs/tags/%{version}.tar.gz
-Patch0000:      0001-modify-for-obs-build.patch
+Patch0001:      0001-add-settings.patch
 BuildArch:      noarch
 Requires:       bash binutils perl tar psmisc build-mkbaselibs
-BuildRequires:  bash binutils perl psmisc tar
+BuildRequires:  bash binutils perl psmisc tar perl-libwww-perl
 
 %description
 This is a tool to build binary packages in a safe and reproducible
@@ -47,6 +47,7 @@ This package contains some man help packages for %{name}.
 
 %install
 %make_install
+%{__install} -m644 settings.xml %{buildroot}/usr/lib/build
 
 %check
 for file in build build-*
@@ -74,8 +75,8 @@ sed -i 's,build-mkbaselibs,,' configs/*.conf
 %{_bindir}/build
 %{_bindir}/buildvc
 %{_bindir}/unrpm
+%{_bindir}/pbuild
 /usr/lib/build
-%config(noreplace) /usr/lib/build/emulator/emulator.sh
 %exclude /usr/lib/build/mkbaselibs
 %exclude /usr/lib/build/baselibs*
 %exclude /usr/lib/build/mkdrpms
@@ -89,16 +90,27 @@ sed -i 's,build-mkbaselibs,,' configs/*.conf
 %files mkdrpms
 %defattr(-,root,root)
 %dir /usr/lib/build
-/usr/lib/build/mkdrpms
 
 %files help
 %defattr(-,root,root)
-%doc README
 %{_mandir}/man1/build.1*
 %{_mandir}/man1/unrpm.1*
 %{_mandir}/man1/buildvc.1*
+%{_mandir}/man1/pbuild.1.gz
 
 %changelog
+* Wed Oct 18 2023 wangkai <13474090681@163.com> - 20230809-1
+- Update to 20230809
+
+* Tue May 10 2022 Wei, Qiang <qiang.wei@suse.com> - 20220429-1
+- Upgrade to 20220429 version
+
+* Sat Jan 15 2022 houyingchao <houyingchao@huawei.com> - 20211125-1
+- Upgrade to 20211125 version
+
+* Thu Jan 07 2021 openEuler miao_kaibo <miaokaibo@outlook.com> - 20191114-324.5
+- Add settings.xml for jar
+
 * Mon Jul 27 2020 openEuler Jeffery.Gao <gaojianxing@huawei.com> - 20191114-324.4
 - Modify for obs-build access URL
 

obs-build.yaml

@@ -1,4 +1,4 @@
 version_control: github
 src_repo: openSUSE/obs-build
-tag_prefix: ^v
+tag_prefix: ""
-seperator: ""
+separator: ""