Hello community, here is the log from the commit of package apache-ivy for openSUSE:Factory checked in at 2017-09-13 22:25:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old) and /work/SRC/openSUSE:Factory/.apache-ivy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-ivy" Wed Sep 13 22:25:02 2017 rev:12 rq:523091 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2017-05-31 13:32:13.927302738 +0200 +++ /work/SRC/openSUSE:Factory/.apache-ivy.new/apache-ivy.changes 2017-09-13 22:25:07.551610106 +0200 @@ -1,0 +2,7 @@ +Thu Sep 7 17:10:15 UTC 2017 - [email protected] + +- Added patch: + * apache-ivy-2.3.0-jdk9.patch + + Use source and target version 1.6 to enable build with jdk9 + +------------------------------------------------------------------- New: ---- apache-ivy-2.3.0-jdk9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-ivy.spec ++++++ --- /var/tmp/diff_new_pack.scQiod/_old 2017-09-13 22:25:08.231514389 +0200 +++ /var/tmp/diff_new_pack.scQiod/_new 2017-09-13 22:25:08.231514389 +0200 @@ -26,10 +26,12 @@ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom +Patch0: apache-ivy-2.3.0-jdk9.patch BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient BuildRequires: dos2unix +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jsch @@ -56,6 +58,7 @@ %prep %setup -q +%patch0 -p1 # Fix messed-up encodings dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt @@ -79,6 +82,7 @@ build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient # Build +export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient) ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc %install ++++++ apache-ivy-2.3.0-jdk9.patch ++++++ --- apache-ivy-2.3.0/build.properties 2012-04-02 23:11:30.000000000 +0200 +++ apache-ivy-2.3.0/build.properties 2017-09-07 14:13:28.647597540 +0200 @@ -42,7 +42,7 @@ checkstyle.src.dir=${basedir}/src/etc/checkstyle rat.report.dir=${reports.dir}/rat -ivy.minimum.javaversion=1.4 +ivy.minimum.javaversion=1.6 debug.mode=on ivy.install.version=1.4.1 --- apache-ivy-2.3.0/build.xml 2012-04-09 08:58:36.000000000 +0200 +++ apache-ivy-2.3.0/build.xml 2017-09-07 14:46:13.128164218 +0200 @@ -517,7 +517,7 @@ </target> <target name="javadoc" unless="skip.javadoc"> - <javadoc destdir="${javadoc.build.dir}" useexternalfile="true"> + <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}"> <fileset dir="${src.dir}" includes="**/*.java" /> </javadoc> </target>
