!10 git

Merge pull request !10 from syyhao/dev

git.spec

@@ -1,7 +1,7 @@
 %global gitexecdir          %{_libexecdir}/git-core
 Name:       git
 Version:    2.23.0
-Release:    11
+Release:    12
 Summary:    A popular and widely used Version Control System
 License:    GPLv2+ or LGPLv2.1
 URL:        https://git-scm.com/
@@ -26,6 +26,9 @@ Patch10:    CVE-2019-1353.patch
 Patch11:    CVE-2019-1354.patch
 Patch12:    CVE-2019-1387.patch
 Patch13:    CVE-2019-19604.patch
+# skip updating the gpg preference during running the test
+# suite, so we add this patch to skip the updating of preference
+Patch14:    skip-updating-the-preference.patch
 
 BuildRequires: openssl-devel libcurl-devel expat-devel systemd asciidoc xmlto glib2-devel libsecret-devel pcre-devel desktop-file-utils
 BuildRequires: python3-devel perl-generators perl-interpreter perl-Error perl(Test::More) perl-MailTools perl(Test) gdb
@@ -268,6 +271,10 @@ make test
 %{_mandir}/man7/git*.7.*
 
 %changelog
+* Thu Mar 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.2
+3.0-12
+- skip updating the preference during running test suite
+
 * Sat Mar 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.23.0-11
 - add build requires of gdb
 

skip-updating-the-preference.patch

@@ -0,0 +1,26 @@
+From 2153fd2197b86d2b2146e0a1320d1e23ad25c074 Mon Sep 17 00:00:00 2001
+From: openEuler Buildteam <buildteam@openeuler.or
+g>
+Date: Thu, 19 Mar 2020 21:06:15 +0800
+Subject: [PATCH] skip updating the preference
+
+---
+ t/lib-gpg.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
+index 8d28652..ffc7f7c 100755
+--- a/t/lib-gpg.sh
++++ b/t/lib-gpg.sh
+@@ -32,7 +32,7 @@ then
+ 		GNUPGHOME="$(pwd)/gpghome" &&
+ 		export GNUPGHOME &&
+ 		(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
+-		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
++		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import --batch \
+ 			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+ 		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
+ 			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+-- 
+1.8.3.1
+