From 9e83cc948a6a7cc4f260149e32c44711893cd7a0 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Fri, 10 Jun 2022 14:26:42 +0800 Subject: [PATCH] remove dependency of apr-util-bdb and add skip testcases Signed-off-by: Chunmei Xu --- git.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git.spec b/git.spec index ac3a0b8..3593988 100644 --- a/git.spec +++ b/git.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 # Pass --without docs to rpmbuild if you don't want the documentation %bcond_without docs @@ -124,8 +124,6 @@ BuildRequires: zlib-devel >= 1.2 %if %{with tests} # Test suite requirements BuildRequires: acl -# Needed by t5540-http-push-webdav.sh -BuildRequires: apr-util-bdb BuildRequires: bash %if %{with cvs} BuildRequires: cvs @@ -687,7 +685,8 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker %endif # Tests to skip on all releases and architectures -GIT_SKIP_TESTS="" +# apr-util-bdb is removed +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5540.5 t5540.6 t5540.7 t5540.8 t5540.9 t5540.10 t5540.11 t5540.13 t5540.15 t5540.16 t5540.17 t5540.18 t5540.19 t5540.20" %ifarch aarch64 # Skip tests which fail on aarch64, arm, and ppc @@ -867,5 +866,8 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri Jun 10 2022 Chunmei Xu - 2.36.1-2 +- remove dependency of apr-util-bdb and add skip testcases + * Tue May 17 2022 mgb01105731 - 2.36.1-1 - Init from upstream version 2.36.1 -- Gitee