diff --git a/ant-antlr.changes b/ant-antlr.changes index accf4ac..e216d8d 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com + +- Update to 1.9.3 +- BugFixes: + * Ant 1.8 exec task changes have slowed exec to a crawl, apache#54128 + * swallowed the status code of nested tasks, + apache#55539 + * a race condition could make tasks of parallel builds to + interfere with each other, apache#54393 + * 's mailport still didn't work properly when using smtps, + apache#49267 + * using attributes belonging to the if and unless namespaces + made macrodef fail, apache#55885. + * Apt is not available under JDK 1.8, apache#55922 +- drop unused macros +- add gpg verification + ------------------------------------------------------------------- Wed Dec 4 14:58:13 UTC 2013 - mvyskocil@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index 85e9707..a87b28f 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -1,7 +1,7 @@ # # spec file for package ant-antlr # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -18,44 +18,39 @@ # -# -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### %global bootstrap 0 -%if ! %with bootstrap # disable javadoc build on arm platform - it delays a build a lot +# mvyskocil: ifarch does not work for noarch packages ... %if %{_arch} != arm -%global build_javadoc 1 +%global build_javadoc 1 +%else +%global build_javadoc 0 %endif -%endif - -%global with_manifest_only 0 %global ant_home %{_datadir}/ant %global major_version 1.9 -%global cvs_version 1.9.2 Name: ant-antlr -Version: 1.9.2 +Version: 1.9.3 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 +Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh +Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc +Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap +BuildRequires: gpg-offline BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel @@ -452,7 +447,10 @@ This package contains the javadoc documentation for Apache Ant. %endif %prep -%setup -q -n apache-ant-%{cvs_version} +%if %bootstrap +%gpg_verify %{SOURCE1001} +%endif +%setup -q -n apache-ant-%{version} #Fixup version find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// diff --git a/ant.changes b/ant.changes index 1f120f7..6a7de0a 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com + +- Update to 1.9.3 +- BugFixes: + * Ant 1.8 exec task changes have slowed exec to a crawl, apache#54128 + * swallowed the status code of nested tasks, + apache#55539 + * a race condition could make tasks of parallel builds to + interfere with each other, apache#54393 + * 's mailport still didn't work properly when using smtps, + apache#49267 + * using attributes belonging to the if and unless namespaces + made macrodef fail, apache#55885. + * Apt is not available under JDK 1.8, apache#55922 +- drop unused macros +- add gpg verification + ------------------------------------------------------------------- Wed Dec 4 14:58:13 UTC 2013 - mvyskocil@suse.com diff --git a/ant.keyring b/ant.keyring new file mode 100644 index 0000000..57b491f --- /dev/null +++ b/ant.keyring @@ -0,0 +1,56 @@ +pub 4096R/82A7FBCD 2010-11-02 +uid Antoine Levy-Lambert (CODE SIGNING KEY) +sub 4096R/70EC4C9A 2010-11-02 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +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 +lNMBJDW/9yGC5PjBUDg= +=gaRx +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ant.spec b/ant.spec index 2ce6ba9..32d4d92 100644 --- a/ant.spec +++ b/ant.spec @@ -1,7 +1,7 @@ # # spec file for package ant # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # @@ -18,43 +18,38 @@ # -# -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - %global bootstrap 1 -%if ! %with bootstrap # disable javadoc build on arm platform - it delays a build a lot +# mvyskocil: ifarch does not work for noarch packages ... %if %{_arch} != arm -%global build_javadoc 1 +%global build_javadoc 1 +%else +%global build_javadoc 0 %endif -%endif - -%global with_manifest_only 0 %global ant_home %{_datadir}/ant %global major_version 1.9 -%global cvs_version 1.9.2 Name: ant -Version: 1.9.2 +Version: 1.9.3 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ -Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 +Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh +Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc +Source1002: ant.keyring Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap +BuildRequires: gpg-offline BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel @@ -451,7 +446,10 @@ This package contains the javadoc documentation for Apache Ant. %endif %prep -%setup -q -n apache-ant-%{cvs_version} +%if %bootstrap +%gpg_verify %{SOURCE1001} +%endif +%setup -q -n apache-ant-%{version} #Fixup version find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// diff --git a/apache-ant-1.9.2-src.tar.bz2 b/apache-ant-1.9.2-src.tar.bz2 deleted file mode 100644 index 6b66f40..0000000 --- a/apache-ant-1.9.2-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 -size 3402876 diff --git a/apache-ant-1.9.3-src.tar.bz2 b/apache-ant-1.9.3-src.tar.bz2 new file mode 100644 index 0000000..5d64050 --- /dev/null +++ b/apache-ant-1.9.3-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb9306e8b8322bb09b78cc3d8e288398f9cb657d76ffc61ee3fb175e786e8365 +size 3409084 diff --git a/apache-ant-1.9.3-src.tar.bz2.asc b/apache-ant-1.9.3-src.tar.bz2.asc new file mode 100644 index 0000000..e6ed6cc --- /dev/null +++ b/apache-ant-1.9.3-src.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BCPG v1.29 + +iQIcBAABAgAQBQJSuFDdCRBe+tn+gqf7zQAALfQQALvsfsoZg1M5Gidza+SGQIun +5jMVKlWs9vftmM5rOpM2Ftv46S8JpYuXzU8liyMcYww+b4S1ANoyEGxz7pR0KR8D +VOi6/hVHIYobk8k2vspjmuq/FRJl/jnIdwwg3B9p2lCVP/Iot4IVwlG+q1cIEJ9e +IHuC/00+KYAvCUmnfqCqB8SqIwejXVdZ8WTfrgyksp0bJv9R01bRxL6txJ1AhANW +RH0rkR0hNCmyDcl9g8d5pziN5YVEY9OvzGsWSzEf79I106oHwh3G+GMhemqB2a8d +sddcrXvj0iPnmyOltAheBPTHBJ3t6VbilFcN3BmGU3zpu+TQQb8q5kItzmHQAR/X +IH4KNGZq2fBJWP5BRHAmD9K+tb69/szm3k0MfKtx3dyWhl8+LiS4j9wCQ3rG30J7 +kOhLC8NOEs/STL6CGKur1WGb9naoJ+xe/tU23nufOZHv1XGL6DTg7dvk3pSZG2Ff +XCjthjba1rzOiGIz72gVgoQGCqWcr2DdVc1tO/HGV9e4Kxks/kRsVwY+dwnL23ka +ynegQoOzl7pqnLrZXjLiyvFGegCrEz1sMmJUsI0pIOIPu8n7wD8YNoeGh4ZaN1qL +W++Oidms2B+/sMaDpsDl9Jw2yC3rkpLbWzbOs/sBDDxKNMOiWgHVK7oVSIdLJwV+ +NyUG09AggTC1/Q3g1+1O +=Gnno +-----END PGP SIGNATURE-----