Hello community,
here is the log from the commit of package ant for openSUSE:Factory checked in at 2018-11-01 14:36:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ant (Old)
and /work/SRC/openSUSE:Factory/.ant.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant"
Thu Nov 1 14:36:20 2018 rev:71 rq:644831 version:1.10.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2018-10-25 08:09:10.280312683 +0200
+++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2018-11-01 14:36:25.462925063 +0100
@@ -1,0 +2,17 @@
+Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com>
+
+- Update to 1.10.5 [bsc#1113136]
+ * Same version as in 1.9.13 but with additional features and
+ requires Java8 or higher.
+ * Dropped patch to build with java8+ already fixed in this version
+ - apache-ant-1.9.9-sourcetarget.patch
+ * Refreshed patch:
+ - apache-ant-class-path-in-manifest.patch
+
+-------------------------------------------------------------------
+Sun Oct 21 08:08:23 UTC 2018 - antoine.belvire(a)opensuse.org
+
+- Add reproducible-build-manifest.patch: Use less detailed version
+ string for manifest's "Created-by" field (boo#1110024).
+
+-------------------------------------------------------------------
ant-junit.changes: same change
ant.changes: same change
Old:
----
apache-ant-1.9.13-src.tar.bz2
apache-ant-1.9.13-src.tar.bz2.asc
apache-ant-1.9.9-sourcetarget.patch
New:
----
apache-ant-1.10.5-src.tar.bz2
apache-ant-1.10.5-src.tar.bz2.asc
reproducible-build-manifest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ant-antlr.spec ++++++
--- /var/tmp/diff_new_pack.6mBfqD/_old 2018-11-01 14:36:29.614924657 +0100
+++ /var/tmp/diff_new_pack.6mBfqD/_new 2018-11-01 14:36:29.618924656 +0100
@@ -24,7 +24,7 @@
%bcond_with junit
%bcond_without antlr
Name: ant-antlr
-Version: 1.9.13
+Version: 1.10.5
Release: 0
Summary: Antlr Task for ant
License: Apache-2.0
@@ -37,11 +37,12 @@
Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
-Patch4: apache-ant-1.9.9-sourcetarget.patch
-Patch5: apache-ant-bootstrap.patch
+Patch2: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
-Patch6: reproducible-build-date.patch
-Patch7: ant-python3.patch
+Patch3: reproducible-build-date.patch
+Patch4: ant-python3.patch
+# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest
+Patch5: reproducible-build-manifest.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
@@ -338,20 +339,21 @@
%patch0 -p1
%endif
%patch1
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
# clean jar files
find . -name "*.jar" -print -delete
# failing testcases. TODO see why
-rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \
- src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+%if %{with antlr} || %{with junit}
+rm src/tests/junit/org/apache/tools/mail/MailMessageTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/TestProcess.java
+%endif
#install jars
%if %{with junit}
@@ -578,8 +580,11 @@
%files
%{_javadir}/ant/ant-antlr.jar
%{ant_home}/lib/ant-antlr.jar
+%{_javadir}/ant/ant-xz.jar
+%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
+%{_mavenpomdir}/JPP.ant-ant-xz.pom
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
%else
++++++ ant-junit.spec ++++++
--- /var/tmp/diff_new_pack.6mBfqD/_old 2018-11-01 14:36:29.630924655 +0100
+++ /var/tmp/diff_new_pack.6mBfqD/_new 2018-11-01 14:36:29.634924655 +0100
@@ -24,7 +24,7 @@
%bcond_without junit
%bcond_with antlr
Name: ant-junit
-Version: 1.9.13
+Version: 1.10.5
Release: 0
Summary: Optional junit tasks for ant
License: Apache-2.0
@@ -37,11 +37,12 @@
Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
-Patch4: apache-ant-1.9.9-sourcetarget.patch
-Patch5: apache-ant-bootstrap.patch
+Patch2: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
-Patch6: reproducible-build-date.patch
-Patch7: ant-python3.patch
+Patch3: reproducible-build-date.patch
+Patch4: ant-python3.patch
+# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest
+Patch5: reproducible-build-manifest.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
@@ -338,20 +339,21 @@
%patch0 -p1
%endif
%patch1
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
# clean jar files
find . -name "*.jar" -print -delete
# failing testcases. TODO see why
-rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \
- src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+%if %{with antlr} || %{with junit}
+rm src/tests/junit/org/apache/tools/mail/MailMessageTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/TestProcess.java
+%endif
#install jars
%if %{with junit}
@@ -578,8 +580,11 @@
%files
%{_javadir}/ant/ant-antlr.jar
%{ant_home}/lib/ant-antlr.jar
+%{_javadir}/ant/ant-xz.jar
+%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
+%{_mavenpomdir}/JPP.ant-ant-xz.pom
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
%else
++++++ ant.spec ++++++
--- /var/tmp/diff_new_pack.6mBfqD/_old 2018-11-01 14:36:29.646924654 +0100
+++ /var/tmp/diff_new_pack.6mBfqD/_new 2018-11-01 14:36:29.650924653 +0100
@@ -23,7 +23,7 @@
%bcond_with junit
%bcond_with antlr
Name: ant
-Version: 1.9.13
+Version: 1.10.5
Release: 0
Summary: Java-based build tool
License: Apache-2.0
@@ -36,11 +36,12 @@
Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
-Patch4: apache-ant-1.9.9-sourcetarget.patch
-Patch5: apache-ant-bootstrap.patch
+Patch2: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
-Patch6: reproducible-build-date.patch
-Patch7: ant-python3.patch
+Patch3: reproducible-build-date.patch
+Patch4: ant-python3.patch
+# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- have fixed "Created-by" in manifest
+Patch5: reproducible-build-manifest.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
@@ -337,20 +338,21 @@
%patch0 -p1
%endif
%patch1
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
# clean jar files
find . -name "*.jar" -print -delete
# failing testcases. TODO see why
-rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \
- src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \
- src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+%if %{with antlr} || %{with junit}
+rm src/tests/junit/org/apache/tools/mail/MailMessageTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java \
+ src/tests/junit/org/apache/tools/ant/taskdefs/TestProcess.java
+%endif
#install jars
%if %{with junit}
@@ -577,8 +579,11 @@
%files
%{_javadir}/ant/ant-antlr.jar
%{ant_home}/lib/ant-antlr.jar
+%{_javadir}/ant/ant-xz.jar
+%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom
+%{_mavenpomdir}/JPP.ant-ant-xz.pom
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr
%else
++++++ apache-ant-1.9.13-src.tar.bz2 -> apache-ant-1.10.5-src.tar.bz2 ++++++
++++ 204781 lines of diff (skipped)
++++++ apache-ant-class-path-in-manifest.patch ++++++
--- /var/tmp/diff_new_pack.6mBfqD/_old 2018-11-01 14:36:31.802924443 +0100
+++ /var/tmp/diff_new_pack.6mBfqD/_new 2018-11-01 14:36:31.802924443 +0100
@@ -2,14 +2,12 @@
===================================================================
--- build.xml.orig
+++ build.xml
-@@ -724,10 +724,6 @@
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
+@@ -719,7 +719,7 @@
</metainf>
-- <manifest>
-- <attribute name="Class-Path"
-- value="ant.jar xalan.jar"/>
-- </manifest>
+ <manifest>
+ <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
+- <attribute name="Class-Path" value="ant.jar xalan.jar"/>
++ <!-- <attribute name="Class-Path" value="ant.jar xalan.jar"/> -->
+ </manifest>
</jar>
- <macrodef name="optional-jar">
++++++ reproducible-build-manifest.patch ++++++
Use Java major version for manifest's Created-by
No need of detailed version such java.vm.version. Java's jar command
uses java.version when it fills the manifest's "Created-by" field,
let's make ant do the same.
Using a detailed version makes that every Java release triggers a
new publication for ant-based applications, only because a line in
manifest has changed - not because the binary or dependencies have
changed. Using a less detailed version reduces these publications.
Using a less detailed version also prevents more subtle problems
such as in boo#1110024: noarch packages differ depending on the
builder architecture, when Java vm version contains an architecture
information (which is the case for openSUSE, though it's probably
not relevant).
--
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -816,10 +816,7 @@ public class Manifest {
try {
insr = new InputStreamReader(in, "UTF-8");
Manifest defaultManifest = new Manifest(insr);
- String version = System.getProperty("java.runtime.version");
- if (version == null) {
- version = System.getProperty("java.vm.version");
- }
+ String version = System.getProperty("java.version");
Attribute createdBy = new Attribute("Created-By",
version + " ("
+ System.getProperty("java.vm.vendor") + ")");