pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 644831 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/644831
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2018-11-01 13:36:20 +00:00 committed by Git OBS Bridge
commit 3100cc0f0a
13 changed files with 150 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ant-antlr.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@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@opensuse.org
- Add reproducible-build-manifest.patch: Use less detailed version
string for manifest's "Created-by" field (boo#1110024).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <fstrba@suse.com> Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <fstrba@suse.com>

29
ant-antlr.spec
View File

@ -24,7 +24,7 @@
%bcond_with junit %bcond_with junit
%bcond_without antlr %bcond_without antlr
Name: ant-antlr Name: ant-antlr
Version: 1.9.13 Version: 1.10.5
Release: 0 Release: 0
Summary: Antlr Task for ant Summary: Antlr Task for ant
License: Apache-2.0 License: Apache-2.0
@ -37,11 +37,12 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source1002: ant.keyring Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch Patch1: apache-ant-class-path-in-manifest.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch Patch2: apache-ant-bootstrap.patch
Patch5: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
Patch6: reproducible-build-date.patch Patch3: reproducible-build-date.patch
Patch7: ant-python3.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: antlr-bootstrap
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -338,20 +339,21 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 %patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%patch7 -p1
# clean jar files # clean jar files
find . -name "*.jar" -print -delete find . -name "*.jar" -print -delete
# failing testcases. TODO see why # failing testcases. TODO see why
rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \ %if %{with antlr} || %{with junit}
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \ rm src/tests/junit/org/apache/tools/mail/MailMessageTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java \
src/tests/junit/org/apache/tools/mail/MailMessageTest.java src/tests/junit/org/apache/tools/ant/taskdefs/TestProcess.java
%endif
#install jars #install jars
%if %{with junit} %if %{with junit}
@ -578,8 +580,11 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
%files %files
%{_javadir}/ant/ant-antlr.jar %{_javadir}/ant/ant-antlr.jar
%{ant_home}/lib/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 %config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom %{_mavenpomdir}/JPP.ant-ant-antlr.pom
%{_mavenpomdir}/JPP.ant-ant-xz.pom
%if %{defined _maven_repository} %if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr %config(noreplace) %{_mavendepmapfragdir}/ant-antlr
%else %else

17
ant-junit.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@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@opensuse.org
- Add reproducible-build-manifest.patch: Use less detailed version
string for manifest's "Created-by" field (boo#1110024).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <fstrba@suse.com> Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <fstrba@suse.com>

29
ant-junit.spec
View File

@ -24,7 +24,7 @@
%bcond_without junit %bcond_without junit
%bcond_with antlr %bcond_with antlr
Name: ant-junit Name: ant-junit
Version: 1.9.13 Version: 1.10.5
Release: 0 Release: 0
Summary: Optional junit tasks for ant Summary: Optional junit tasks for ant
License: Apache-2.0 License: Apache-2.0
@ -37,11 +37,12 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source1002: ant.keyring Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch Patch1: apache-ant-class-path-in-manifest.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch Patch2: apache-ant-bootstrap.patch
Patch5: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
Patch6: reproducible-build-date.patch Patch3: reproducible-build-date.patch
Patch7: ant-python3.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: antlr-bootstrap
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -338,20 +339,21 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 %patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%patch7 -p1
# clean jar files # clean jar files
find . -name "*.jar" -print -delete find . -name "*.jar" -print -delete
# failing testcases. TODO see why # failing testcases. TODO see why
rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \ %if %{with antlr} || %{with junit}
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \ rm src/tests/junit/org/apache/tools/mail/MailMessageTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java \
src/tests/junit/org/apache/tools/mail/MailMessageTest.java src/tests/junit/org/apache/tools/ant/taskdefs/TestProcess.java
%endif
#install jars #install jars
%if %{with junit} %if %{with junit}
@ -578,8 +580,11 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
%files %files
%{_javadir}/ant/ant-antlr.jar %{_javadir}/ant/ant-antlr.jar
%{ant_home}/lib/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 %config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom %{_mavenpomdir}/JPP.ant-ant-antlr.pom
%{_mavenpomdir}/JPP.ant-ant-xz.pom
%if %{defined _maven_repository} %if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr %config(noreplace) %{_mavendepmapfragdir}/ant-antlr
%else %else

17
ant.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@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@opensuse.org
- Add reproducible-build-manifest.patch: Use less detailed version
string for manifest's "Created-by" field (boo#1110024).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <fstrba@suse.com> Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <fstrba@suse.com>

29
ant.spec
View File

@ -23,7 +23,7 @@
%bcond_with junit %bcond_with junit
%bcond_with antlr %bcond_with antlr
Name: ant Name: ant
Version: 1.9.13 Version: 1.10.5
Release: 0 Release: 0
Summary: Java-based build tool Summary: Java-based build tool
License: Apache-2.0 License: Apache-2.0
@ -36,11 +36,12 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source1002: ant.keyring Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch Patch1: apache-ant-class-path-in-manifest.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch Patch2: apache-ant-bootstrap.patch
Patch5: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates #PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
Patch6: reproducible-build-date.patch Patch3: reproducible-build-date.patch
Patch7: ant-python3.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: antlr-bootstrap
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -337,20 +338,21 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 %patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%patch7 -p1
# clean jar files # clean jar files
find . -name "*.jar" -print -delete find . -name "*.jar" -print -delete
# failing testcases. TODO see why # failing testcases. TODO see why
rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \ %if %{with antlr} || %{with junit}
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \ rm src/tests/junit/org/apache/tools/mail/MailMessageTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java \
src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java \
src/tests/junit/org/apache/tools/mail/MailMessageTest.java src/tests/junit/org/apache/tools/ant/taskdefs/TestProcess.java
%endif
#install jars #install jars
%if %{with junit} %if %{with junit}
@ -577,8 +579,11 @@ rm -rf %{buildroot}%{_bindir}/ant.orig
%files %files
%{_javadir}/ant/ant-antlr.jar %{_javadir}/ant/ant-antlr.jar
%{ant_home}/lib/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 %config(noreplace) %{_sysconfdir}/ant.d/antlr
%{_mavenpomdir}/JPP.ant-ant-antlr.pom %{_mavenpomdir}/JPP.ant-ant-antlr.pom
%{_mavenpomdir}/JPP.ant-ant-xz.pom
%if %{defined _maven_repository} %if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-antlr %config(noreplace) %{_mavendepmapfragdir}/ant-antlr
%else %else

3
apache-ant-1.10.5-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71a5cdd45a54901b6321d5a140d882f7580c38f766a4e4959bcc36555da9f3ac
size 4465063

7
apache-ant-1.10.5-src.tar.bz2.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCW0Q7MxMcYm9kZXdpZ0Bh
cGFjaGUub3JnAAoJEKIRWuFfa4tyzhgAnjm93RxZse+OTsHXSA4m/txk26H2AKDR
0ZiH+bMOnsqyf0QiKV6KJHHk/A==
=CfJX
-----END PGP SIGNATURE-----

3
apache-ant-1.9.13-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdefd01c909a69fbeab1c45a815e3a80d86351f61b992dfe2e2191d9b009aaaf
size 3954912

7
apache-ant-1.9.13-src.tar.bz2.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCW0Q0YRMcYm9kZXdpZ0Bh
cGFjaGUub3JnAAoJEKIRWuFfa4tybcAAn1oATFgWAOie3kvfCEmSDx63/s/vAKCI
yP3/ZtUHscFF3h4Y4gMyjPKyhQ==
=J5Fl
-----END PGP SIGNATURE-----

13
apache-ant-1.9.9-sourcetarget.patch
View File

@ -1,13 +0,0 @@
--- apache-ant-1.9.9/build.xml 2017-02-02 18:55:08.000000000 +0100
+++ apache-ant-1.9.9/build.xml 2017-09-06 19:42:13.917021125 +0200
@@ -104,8 +104,8 @@
<property name="chmod.maxparallel" value="250"/>
<property name="deprecation" value="false"/>
<property name="optimize" value="true"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
+ <property name="javac.target" value="8"/>
+ <property name="javac.source" value="8"/>
<property name="junit.filtertrace" value="off"/>
<property name="junit.summary" value="no"/>
<property name="test.haltonfailure" value="false"/>

14
apache-ant-class-path-in-manifest.patch
View File

@ -2,14 +2,12 @@ Index: build.xml
=================================================================== ===================================================================
--- build.xml.orig --- build.xml.orig
+++ build.xml +++ build.xml
@@ -724,10 +724,6 @@ @@ -719,7 +719,7 @@
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
</metainf> </metainf>
- <manifest> <manifest>
- <attribute name="Class-Path" <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
- value="ant.jar xalan.jar"/> - <attribute name="Class-Path" value="ant.jar xalan.jar"/>
- </manifest> + <!-- <attribute name="Class-Path" value="ant.jar xalan.jar"/> -->
</manifest>
</jar> </jar>
<macrodef name="optional-jar">

32
reproducible-build-manifest.patch Normal file
View File

@ -0,0 +1,32 @@
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") + ")");