!11 gradle delete -S git from %autosetup, and delete BuildRequires git

From: @chenyanpanHW
Reviewed-by: @wangchong1995924
Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot 2021-08-19 07:13:19 +00:00 committed by Gitee
commit 74dc60b287

View File

@ -1,7 +1,7 @@
%bcond_with bootstrap %bcond_with bootstrap
Name: gradle Name: gradle
Version: 4.4.1 Version: 4.4.1
Release: 2 Release: 3
Summary: Build automation tool Summary: Build automation tool
License: ASL 2.0 License: ASL 2.0
URL: http://www.gradle.org/ URL: http://www.gradle.org/
@ -41,7 +41,6 @@ Patch0016: 0016-Port-to-guava-20.0.patch
Patch0017: 0017-Set-core-api-source-level-to-8.patch Patch0017: 0017-Set-core-api-source-level-to-8.patch
Patch0018: 0018-Use-HTTPS-for-GoogleAPIs-repository.patch Patch0018: 0018-Use-HTTPS-for-GoogleAPIs-repository.patch
Patch0019: CVE-2019-16370.patch Patch0019: CVE-2019-16370.patch
BuildRequires: git
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: groovy >= 2.3 javapackages-local BuildRequires: groovy >= 2.3 javapackages-local
%else %else
@ -156,7 +155,7 @@ choice for many open source projects, leading edge enterprises and
legacy automation challenges. legacy automation challenges.
%prep %prep
%autosetup -S git %autosetup -p1
rm -rf gradle/wrapper/ rm -rf gradle/wrapper/
>subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/jquery.jstree.js >subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/jquery.jstree.js
mkdir -p build mkdir -p build
@ -238,6 +237,9 @@ install -p -m 644 man/gradle.1 %{buildroot}%{_mandir}/man1/gradle.1
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 4.4.1-3
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Tue Jul 27 2021 liwu <liwu13@huawei.com> - 4.4.1-2 * Tue Jul 27 2021 liwu <liwu13@huawei.com> - 4.4.1-2
- fix CVE-2019-16370 - fix CVE-2019-16370