From 52511dc9218ceeddede1da3248d8a71aa1dd912c Mon Sep 17 00:00:00 2001 From: jackie_wu123 Date: Wed, 22 Apr 2020 16:13:49 +0800 Subject: [PATCH] fix x86 build errors --- apache-ivy-global-settings.patch | 11 +++++++++++ apache-ivy.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 apache-ivy-global-settings.patch diff --git a/apache-ivy-global-settings.patch b/apache-ivy-global-settings.patch new file mode 100644 index 0000000..29cf61e --- /dev/null +++ b/apache-ivy-global-settings.patch @@ -0,0 +1,11 @@ +--- src/java/org/apache/ivy/ant/IvyAntSettings.java~ 2014-05-23 19:56:50.000000000 +0200 ++++ src/java/org/apache/ivy/ant/IvyAntSettings.java 2015-04-01 12:37:37.537520590 +0200 +@@ -346,7 +346,7 @@ + File[] settingsLocations = new File[] { + new File(getProject().getBaseDir(), settingsFileName), + new File(getProject().getBaseDir(), "ivyconf.xml"), new File(settingsFileName), +- new File("ivyconf.xml")}; ++ new File("ivyconf.xml"), new File("/etc/ivy/ivysettings.xml")}; + for (int i = 0; i < settingsLocations.length; i++) { + file = settingsLocations[i]; + task.log("searching settings file: trying " + file, Project.MSG_VERBOSE); diff --git a/apache-ivy.spec b/apache-ivy.spec index 08aa23f..d145ade 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,12 +1,13 @@ Name: apache-ivy Version: 2.4.0 -Release: 16 +Release: 17 Summary: Java-based dependency manager License: ASL 2.0 URL: https://ant.apache.org/ivy/ Source0: http://mirrors.tuna.tsinghua.edu.cn/apache//ant/ivy/%{version}/%{name}-%{version}-src.tar.gz Patch0: 0001-Update-bouncycastle-to-1.52.patch +Patch1: apache-ivy-global-settings.patch BuildArch: noarch BuildRequires: ant ant-contrib ant-testutil apache-commons-lang jakarta-commons-httpclient jsch @@ -59,5 +60,8 @@ echo "apache-ivy/ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name} %doc README NOTICE %changelog +* Wed Apr 22 2020 wutao - 2.4.0-17 +- fix build erros + * Thu Jan 16 2020 Jiangping Hu - 2.4.0-16 - Package init -- Gitee