From 3e36226ad0d2151a652d64cdfc3a09939f8e20ad Mon Sep 17 00:00:00 2001
From: root <fundawang@yeah.net>
Date: Thu, 26 Oct 2023 10:54:26 +0800
Subject: [PATCH] Try building with bundled libgit2 for upgrading

---
 rust.spec | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/rust.spec b/rust.spec
index 19dfeb7..c02956c 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,4 +1,4 @@
-%define anolis_release 3
+%define anolis_release 4
 %global rust_arches x86_64 aarch64 loongarch64
 %global channel stable
 %global bootstrap_version 1.68.2
@@ -27,7 +27,7 @@
 %bcond_with bootstrap
 %bcond_with static
 %bcond_with cmake_path
-%bcond_with bundled_libgit2
+%bcond_without bundled_libgit2
 %bcond_without curl_http2
 %bcond_without lldb
 %bcond_without debug
@@ -282,25 +282,25 @@ test -f '%{local_rust_root}/bin/rustc'
 %endif
 
 %setup -q -n rustc-%{version}-src
-%patch0001 -p1
-%patch0002 -p1
-%patch0005 -p1
+%patch -P0001 -p1
+%patch -P0002 -p1
+%patch -P0005 -p1
 
 %if %{without libssh2}
-%patch0003 -p1
+%patch -P0003 -p1
 %endif
 
 %if %{without curl_http2}
-%patch0004 -p1
+%patch -P0004 -p1
 rm -rf vendor/libnghttp2-sys/
 %endif
 
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
+%patch -P0006 -p1
+%patch -P0007 -p1
+%patch -P0008 -p1
+%patch -P0009 -p1
+%patch -P0010 -p1
+%patch -P0011 -p1
 
 sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure
 sed -i.rust-src -e "s#@BUILDDIR@#$PWD#" ./src/etc/rust-gdb
@@ -586,6 +586,9 @@ done
 %doc src/tools/rust-analyzer/README.md
 
 %changelog
+* Thu Oct 26 2023 Funda Wang <fundawang@yeah.net> - 1.69.0-4
+- Try building with bundled libgit2 for upgrading
+
 * Mon Aug 7 2023 WANG Rui <wangrui@loongson.cn> - 1.69.0-3
 - Add support for loongarch64.
 
-- 
Gitee