diff --git a/ant-antlr.changes b/ant-antlr.changes index 745e6af..faeb135 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez + +- 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 diff --git a/ant-antlr.spec b/ant-antlr.spec index 242ed1e..4710092 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -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,13 +37,12 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src. 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 -Patch8: reproducible-build-manifest.patch +Patch5: reproducible-build-manifest.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -340,21 +339,21 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// %patch0 -p1 %endif %patch1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -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} @@ -581,8 +580,11 @@ rm -rf %{buildroot}%{_bindir}/ant.orig %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 diff --git a/ant-junit.changes b/ant-junit.changes index 745e6af..faeb135 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez + +- 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 diff --git a/ant-junit.spec b/ant-junit.spec index 29062ed..5a5e051 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -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,13 +37,12 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src. 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 -Patch8: reproducible-build-manifest.patch +Patch5: reproducible-build-manifest.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -340,21 +339,21 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// %patch0 -p1 %endif %patch1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -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} @@ -581,8 +580,11 @@ rm -rf %{buildroot}%{_bindir}/ant.orig %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 diff --git a/ant.changes b/ant.changes index 745e6af..faeb135 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez + +- 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 diff --git a/ant.spec b/ant.spec index 071456b..7849d80 100644 --- a/ant.spec +++ b/ant.spec @@ -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,13 +36,12 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src. 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 -Patch8: reproducible-build-manifest.patch +Patch5: reproducible-build-manifest.patch BuildRequires: antlr-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -339,21 +338,21 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// %patch0 -p1 %endif %patch1 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -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} @@ -580,8 +579,11 @@ rm -rf %{buildroot}%{_bindir}/ant.orig %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 diff --git a/apache-ant-1.10.5-src.tar.bz2 b/apache-ant-1.10.5-src.tar.bz2 new file mode 100644 index 0000000..903d3a1 --- /dev/null +++ b/apache-ant-1.10.5-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a5cdd45a54901b6321d5a140d882f7580c38f766a4e4959bcc36555da9f3ac +size 4465063 diff --git a/apache-ant-1.10.5-src.tar.bz2.asc b/apache-ant-1.10.5-src.tar.bz2.asc new file mode 100644 index 0000000..1599974 --- /dev/null +++ b/apache-ant-1.10.5-src.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCW0Q7MxMcYm9kZXdpZ0Bh +cGFjaGUub3JnAAoJEKIRWuFfa4tyzhgAnjm93RxZse+OTsHXSA4m/txk26H2AKDR +0ZiH+bMOnsqyf0QiKV6KJHHk/A== +=CfJX +-----END PGP SIGNATURE----- diff --git a/apache-ant-1.9.13-src.tar.bz2 b/apache-ant-1.9.13-src.tar.bz2 deleted file mode 100644 index 42feaa8..0000000 --- a/apache-ant-1.9.13-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdefd01c909a69fbeab1c45a815e3a80d86351f61b992dfe2e2191d9b009aaaf -size 3954912 diff --git a/apache-ant-1.9.13-src.tar.bz2.asc b/apache-ant-1.9.13-src.tar.bz2.asc deleted file mode 100644 index 8ad0c0f..0000000 --- a/apache-ant-1.9.13-src.tar.bz2.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHEEABECADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCW0Q0YRMcYm9kZXdpZ0Bh -cGFjaGUub3JnAAoJEKIRWuFfa4tybcAAn1oATFgWAOie3kvfCEmSDx63/s/vAKCI -yP3/ZtUHscFF3h4Y4gMyjPKyhQ== -=J5Fl ------END PGP SIGNATURE----- diff --git a/apache-ant-1.9.9-sourcetarget.patch b/apache-ant-1.9.9-sourcetarget.patch deleted file mode 100644 index d4b242a..0000000 --- a/apache-ant-1.9.9-sourcetarget.patch +++ /dev/null @@ -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 @@ - - - -- -- -+ -+ - - - diff --git a/apache-ant-class-path-in-manifest.patch b/apache-ant-class-path-in-manifest.patch index d0ccc8e..6ac1fc7 100644 --- a/apache-ant-class-path-in-manifest.patch +++ b/apache-ant-class-path-in-manifest.patch @@ -2,14 +2,12 @@ Index: build.xml =================================================================== --- build.xml.orig +++ build.xml -@@ -724,10 +724,6 @@ - - +@@ -719,7 +719,7 @@ -- -- -- + + +- ++ + -