packages/apache-ivy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix failed

Browse Source
This commit is contained in:
yanglijin 2020-04-07 04:55:48 -04:00
parent 06355fc86d
commit 7ec6fe9fc3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache-ivy-global-settings.patch Normal file
View File

@ -0,0 +1,11 @@
--- apache-ivy-2.4.0/src/java/org/apache/ivy/ant/IvyAntSettings.java~ 2014-05-23 19:56:50.000000000 +0200
+++ apache-ivy-2.4.0/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);

7
apache-ivy.spec
View File

@ -1,13 +1,13 @@
Name: apache-ivy Name: apache-ivy
Version: 2.4.0 Version: 2.4.0
Release: 16 Release: 17
Summary: Java-based dependency manager Summary: Java-based dependency manager
License: ASL 2.0 License: ASL 2.0
URL: https://ant.apache.org/ivy/ URL: https://ant.apache.org/ivy/
Source0: http://mirrors.tuna.tsinghua.edu.cn/apache//ant/ivy/%{version}/%{name}-%{version}-src.tar.gz Source0: http://mirrors.tuna.tsinghua.edu.cn/apache//ant/ivy/%{version}/%{name}-%{version}-src.tar.gz
Patch0: 0001-Update-bouncycastle-to-1.52.patch Patch0: 0001-Update-bouncycastle-to-1.52.patch
Patch1: apache-ivy-global-settings.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: ant ant-contrib ant-testutil apache-commons-lang jakarta-commons-httpclient jsch BuildRequires: ant ant-contrib ant-testutil apache-commons-lang jakarta-commons-httpclient jsch
BuildRequires: jakarta-oro apache-commons-parent sonatype-oss-parent apache-parent ivy-local >= 4 BuildRequires: jakarta-oro apache-commons-parent sonatype-oss-parent apache-parent ivy-local >= 4
@ -59,5 +59,8 @@ echo "apache-ivy/ivy" > %{buildroot}%{_sysconfdir}/ant.d/%{name}
%doc README NOTICE %doc README NOTICE
%changelog %changelog
* Tue Apr 7 2020 yanglijin <yanglijin@huawei.com> - 2.4.0-17
- fix build failed
* Thu Jan 16 2020 Jiangping Hu <hujp1985@foxmail.com> - 2.4.0-16 * Thu Jan 16 2020 Jiangping Hu <hujp1985@foxmail.com> - 2.4.0-16
- Package init - Package init