diff --git a/apache-ivy-global-settings.patch b/apache-ivy-global-settings.patch new file mode 100644 index 0000000..3cb0fff --- /dev/null +++ b/apache-ivy-global-settings.patch @@ -0,0 +1,27 @@ +From 27cf17a1eea310b8d75efc7fc9d4d733fffcbdc1 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 19 Oct 2018 15:25:30 +0200 +Subject: [PATCH] Change global settings + +--- + src/java/org/apache/ivy/ant/IvyAntSettings.java | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/java/org/apache/ivy/ant/IvyAntSettings.java b/src/java/org/apache/ivy/ant/IvyAntSettings.java +index 660ebbe..85cf97f 100644 +--- a/src/java/org/apache/ivy/ant/IvyAntSettings.java ++++ b/src/java/org/apache/ivy/ant/IvyAntSettings.java +@@ -354,6 +354,10 @@ public class IvyAntSettings extends DataType { + break; + } + } ++ if (!file.exists() && task.getProject().getProperty("ivy.mode") != null) { ++ file = new File("/etc/ivy/ivysettings.xml"); ++ task.log("searching settings file: trying " + file, Project.MSG_VERBOSE); ++ } + if (!file.exists()) { + file = null; + if (Boolean.valueOf(getProject().getProperty("ivy.14.compatible")).booleanValue()) { +-- +2.17.2 + diff --git a/apache-ivy.changes b/apache-ivy.changes index f633501..e06d184 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -5,6 +5,9 @@ Mon Nov 26 10:25:21 UTC 2018 - Fridrich Strba - Modified patch: * apache-ivy-2.3.0-jdk9.patch -> apache-ivy-2.4.0-jdk9.patch + rediff to changed context +- Added patch: + * apache-ivy-global-settings.patch + + change global settings ------------------------------------------------------------------- Tue May 15 13:26:55 UTC 2018 - fstrba@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index acb46fb..321bc1a 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -27,6 +27,7 @@ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom Patch0: apache-ivy-2.4.0-jdk9.patch +Patch1: apache-ivy-global-settings.patch BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient @@ -36,8 +37,8 @@ BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jsch BuildRequires: oro -Provides: ivy = %{version} -Obsoletes: ivy < %{version} +Provides: ivy = %{version}-%{release} +Obsoletes: ivy < %{version}-%{release} BuildArch: noarch %description @@ -59,6 +60,7 @@ JavaDoc documentation for %{name} %prep %setup -q %patch0 -p1 +%patch1 -p1 #TODO: return back when bouncycastle-pgp will be available rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle