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

Accepting request 319379 from Java:packages

Browse Source 
- Add xalan-j2-serializer to ant-antlr requirements

- Sync the changes files among the subpkgs
- Version bump to 1.9.6:
  * Read WHATSNEW file for full changelist

- Do better quoting to get better error messages when it fails

- Fix build with new javapackages-tools

- to bootstrap 13.2 we need another split because bsf depends on things
  that depend on junit and as antlr requires bsf, we need a 3rd step ->
  split ant-junit to build in between ant and ant-antlr

- Fix building on SLE.
- Added patch:
  * apache-ant-old-gcj-build.patch
- fix summary (was antlr summary) 

- SLE_11 specific spec files for ant/ant-antlr. These build with
  openjdk, which introduced bootstrap breakage in Factory.
- Update pre_checkin.sh for SLE_11 specific spec's

- remove dependency on gpg-offline (blocks rebuilds and
  tarball integrity is checked by source-validator anyway, plus
  it was commented out)
- remove apache-ant-bz163689.patch (was not applied anywhere)

- Update packaging to build the openjdk and not gcj

OBS-URL: https://build.opensuse.org/request/show/319379
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger 2015-08-10 07:11:27 +00:00 committed by Git OBS Bridge
commit 096a081ab1
12 changed files with 259 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
ant-antlr.changes
View File

@ -1,7 +1,38 @@
-------------------------------------------------------------------
Fri Jul 4 12:56:17 UTC 2014 - tchvatal@suse.com
Wed Jul 29 11:12:50 UTC 2015 - tchvatal@suse.com
- Fix borked summaries for subpackages.
- Add xalan-j2-serializer to ant-antlr requirements
-------------------------------------------------------------------
Tue Jul 28 14:15:24 UTC 2015 - tchvatal@suse.com
- Sync the changes files among the subpkgs
- Version bump to 1.9.6:
* Read WHATSNEW file for full changelist
-------------------------------------------------------------------
Sun Jun 21 14:05:05 UTC 2015 - jengelh@inai.de
- Do better quoting to get better error messages when it fails
-------------------------------------------------------------------
Wed Mar 18 09:30:13 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
-------------------------------------------------------------------
Thu Aug 28 14:30:48 UTC 2014 - coolo@suse.com
- to bootstrap 13.2 we need another split because bsf depends on things
that depend on junit and as antlr requires bsf, we need a 3rd step ->
split ant-junit to build in between ant and ant-antlr
-------------------------------------------------------------------
Fri Jul 4 12:47:07 UTC 2014 - tchvatal@suse.com
- Fix building on SLE.
- Added patch:
* apache-ant-old-gcj-build.patch
-------------------------------------------------------------------
Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com
@ -16,10 +47,35 @@ Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com
NUL.
-------------------------------------------------------------------
Fri May 2 09:01:15 UTC 2014 - tchvatal@suse.com
Thu May 15 13:18:36 UTC 2014 - peter.trommler@ohm-hochschule.de
- fix summary (was antlr summary)
-------------------------------------------------------------------
Mon May 12 14:00:55 UTC 2014 - darin@darins.net
- SLE_11 specific spec files for ant/ant-antlr. These build with
openjdk, which introduced bootstrap breakage in Factory.
- Update pre_checkin.sh for SLE_11 specific spec's
-------------------------------------------------------------------
Fri May 2 09:01:02 UTC 2014 - tchvatal@suse.com
- Revert the bootstrap breakage.
-------------------------------------------------------------------
Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com
- remove dependency on gpg-offline (blocks rebuilds and
tarball integrity is checked by source-validator anyway, plus
it was commented out)
- remove apache-ant-bz163689.patch (was not applied anywhere)
-------------------------------------------------------------------
Wed Apr 23 12:55:35 UTC 2014 - darin@darins.net
- Update packaging to build the openjdk and not gcj
-------------------------------------------------------------------
Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com
@ -49,10 +105,76 @@ Wed Oct 2 09:52:33 UTC 2013 - mvyskocil@suse.com
- install compat symlink to /usr/share/ant/bin/antRun to make scala build
-------------------------------------------------------------------
Mon Sep 9 11:31:21 UTC 2013 - tchvatal@suse.com
Mon Sep 9 11:05:25 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Thu Aug 22 07:47:26 UTC 2013 - mvyskocil@suse.com
- Update to 1.9.2
- Incompatible changes:
* ProjectHelper's implementation import and include tasks
defaults the targetPrefix to ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX.
ProjectHelper2 is not affected, apache#54940.
* FixCRLF used to treat the EOL value ASIS to convert to the system property
line.separator. Specified was that ASIS would leave the EOL characters alone,
the task now really leaves the EOL characters alone. This also implies that
EOL ASIS will not insert a newline even if fixlast is set to true.
apache#53036
* The CommandLauncher hierarchy that used to be a set of inner
classes of Execute has been extracted to the
org.apache.tools.ant.taskdefs.launcher package.
* Any FileResource whose represented File has a parent also has a basedir.
* Removing the Perforce Ant tasks replaced by tasks supplied by Perforce Inc.
* Setting the default encoding of StringResource to UTF-8 instead of null
- Bugfixes:
* <javadoc> post-process generated docs to migitiate frame
injection attack (CVE-2013-1571) apache#55132
* Parsing of zip64 extra fields has become more lenient
* TarInputStream should now properly read GNU longlink entries' names.
apache#55040.
* <java> and <exec> used to be too restrictive when evaluating
whether a given set of options is compatible with spawning the new
process, apache#55112.
* Corrected XSLTC error in <junitreport>, apache#54641.
* and many more, see WHATSNEW for details
-------------------------------------------------------------------
Mon Jan 7 12:15:09 UTC 2013 - mvyskocil@suse.com
- remove xerces-j2-bootstrap depenency (bnc#789163)
-------------------------------------------------------------------
Wed May 30 11:46:44 UTC 2012 - cfarrell@suse.com
- license update: CDDL-1.0
SPDX format (note that it should CDDL-1.1 if the (c) owner and license
steward is Oracle)
-------------------------------------------------------------------
Tue May 15 07:02:23 UTC 2012 - mvyskocil@suse.cz
- build ignore java-1_7_0-openjdk as well
-------------------------------------------------------------------
Wed Feb 1 12:54:47 UTC 2012 - mvyskocil@suse.cz
- revert the Recommends to fix a lot of build fails
-------------------------------------------------------------------
Wed Jan 25 09:54:17 UTC 2012 - mvyskocil@suse.cz
- use new _mavendepmapfragdir macro instead of hardocded path
- change java-devel Requires to Recommends
-------------------------------------------------------------------
Tue Jan 3 01:01:19 CET 2012 - dmueller@suse.de
- use dist-lite and dist_javadocs to make javadoc build really
optional
- fix arm check (ifarch does not work in a noarch spec file)
-------------------------------------------------------------------
Thu Dec 15 08:49:28 UTC 2011 - mvyskocil@suse.cz
@ -60,10 +182,15 @@ Thu Dec 15 08:49:28 UTC 2011 - mvyskocil@suse.cz
- disable javadoc build on arm to speedup the build of java platform
-------------------------------------------------------------------
Sat Sep 17 11:04:53 UTC 2011 - jengelh@medozas.de
Sat Sep 17 11:04:48 UTC 2011 - jengelh@medozas.de
- Remove redundant tags/sections from specfile
-------------------------------------------------------------------
Mon Mar 14 13:02:38 UTC 2011 - mvyskocil@suse.cz
- ignore openjdk for build of core ant
-------------------------------------------------------------------
Wed Mar 9 08:56:33 UTC 2011 - mvyskocil@suse.cz
@ -112,39 +239,34 @@ Wed Mar 9 08:56:33 UTC 2011 - mvyskocil@suse.cz
- remove all pom files, as they are included and build from source tarball
-------------------------------------------------------------------
Fri Apr 9 10:42:30 UTC 2010 - mvyskocil@suse.cz
Fri Apr 9 10:41:42 UTC 2010 - mvyskocil@suse.cz
- fix bnc#595144 - Compiled binary in ant
remove test.exe from source tarball
-------------------------------------------------------------------
Thu Mar 18 15:59:33 UTC 2010 - mvyskocil@suse.cz
Thu Mar 18 15:58:41 UTC 2010 - mvyskocil@suse.cz
- fix the compat symlinks
-------------------------------------------------------------------
Wed Mar 17 15:06:01 UTC 2010 - mvyskocil@suse.cz
Wed Mar 17 15:05:43 UTC 2010 - mvyskocil@suse.cz
- return back the /usr/share/ant/lib compat symlinks
http://lists.opensuse.org/opensuse-java/2010-03/msg00007.html
-------------------------------------------------------------------
Mon Jul 20 15:48:54 CEST 2009 - coolo@novell.com
- build against log4j-mini to avoid build cycle
-------------------------------------------------------------------
Wed Jun 17 10:23:50 CEST 2009 - mvyskocil@suse.cz
Wed Jun 17 10:22:10 CEST 2009 - mvyskocil@suse.cz
- do not use Release number in Requires of subpackages
-------------------------------------------------------------------
Sun May 3 11:37:46 CEST 2009 - ro@suse.de
Sun May 3 11:37:14 CEST 2009 - ro@suse.de
- do not assume release number for ant and ant-antlr are identical
- do not assume release number for ant and ant-antlr are identical
-------------------------------------------------------------------
Tue Apr 28 15:17:09 CEST 2009 - mvyskocil@suse.cz
Tue Apr 28 15:03:07 CEST 2009 - mvyskocil@suse.cz
- update to 1.7.1. Upstream changes (full list is in WHATSNEW):
* String resources only have properties single expanded. If you relied on
@ -176,35 +298,37 @@ Tue Apr 28 15:17:09 CEST 2009 - mvyskocil@suse.cz
* bootstrap == 0 means build rest of ant modules + ant-javadoc
-------------------------------------------------------------------
Wed Oct 1 12:44:49 CEST 2008 - mvyskocil@suse.cz
Mon Nov 3 11:45:06 CET 2008 - mvyskocil@suse.cz
- use a antlr-bootstrap do avoid another cycle
- [bnc#440645] - ant fails without installed jdk:
- added a java-devel to Recommends:
-------------------------------------------------------------------
Wed Jul 16 14:10:12 CEST 2008 - coolo@suse.de
Mon Jul 21 16:29:31 CEST 2008 - ro@suse.de
- use xerces-j2-bootstrap to build (as early as possible)
- add java doc dir to filelist of javadoc subpackage to fix build
-------------------------------------------------------------------
Wed Jul 16 14:11:41 CEST 2008 - coolo@suse.de
- avoid another build cycle
-------------------------------------------------------------------
Wed May 7 10:45:54 CEST 2008 - mvyskocil@suse.cz
Wed May 7 10:45:27 CEST 2008 - mvyskocil@suse.cz
- build using gcj, to allow a openjdk6 bootstrap
- change a source and a target level to 1.5 in build.xml
-------------------------------------------------------------------
Sun Feb 17 20:44:23 CET 2008 - coolo@suse.de
Tue Aug 14 13:52:03 CEST 2007 - skh@suse.de
- fix changelog for build service
-------------------------------------------------------------------
Sun Jul 8 00:14:04 CEST 2007 - dbornkessel@suse.de
- add links to jar files in /usr/share/ant/lib
- disable junit tests and remove junit from BuildRequires to break
circular build dependency
-------------------------------------------------------------------
Fri Jul 6 19:24:52 CEST 2007 - dbornkessel@suse.de
- make packages noarch, as jai was removed
- update to version 1.7.0
major changes are (for a complete list, consult /usr/share/doc/packages/ant/WHATSNEW):
@ -319,89 +443,33 @@ Fri Jul 6 19:24:52 CEST 2007 - dbornkessel@suse.de
http://ant.apache.org/antlibs/dotnet/index.html
-------------------------------------------------------------------
Tue May 8 10:39:14 CEST 2007 - dbornkessel@suse.de
- removed all jai stuff as jai was dropped
-------------------------------------------------------------------
Fri Sep 22 15:48:51 CEST 2006 - dbornkessel@suse.de
Fri Sep 22 14:34:40 CEST 2006 - dbornkessel@suse.de
- read in properties in /etc/ant.conf
- added source=1.4
-------------------------------------------------------------------
Mon May 8 14:29:41 CEST 2006 - dbornkessel@suse.de
Mon May 8 14:54:11 CEST 2006 - dbornkessel@suse.de
- changed last change (see line below): Requires are only bound to the version, not to the release anymore
--> lrupp: fix Requires for ant (#171473 describes the same for dbus-1)
-------------------------------------------------------------------
Thu Feb 2 21:17:16 CET 2006 - dbornkessel@suse.de
-------------------------------------------------------------------
Thu Feb 2 20:55:06 CET 2006 - dbornkessel@suse.de
- fixed rpmlint errors and warnings
-------------------------------------------------------------------
Thu Feb 2 20:55:06 CET 2006 - dbornkessel@suse.de
- fixed rpmlint errors and warnings
-------------------------------------------------------------------
Thu Feb 2 20:54:34 CET 2006 - dbornkessel@suse.de
- fixed rpmlint errors and warnings
-------------------------------------------------------------------
Tue Jan 31 17:29:45 CET 2006 - dbornkessel@suse.de
- only ant-antlr updates
-------------------------------------------------------------------
Tue Jan 31 17:29:45 CET 2006 - dbornkessel@suse.de
- only ant-antlr updates
-------------------------------------------------------------------
Tue Jan 31 17:04:03 CET 2006 - dbornkessel@suse.de
- removed noarch due to different dependencies
- removed jsch and commons-net because we don't have the necessary packages
- ifarch'ed jai as it has a binary only dependency on a i386-only package
-------------------------------------------------------------------
Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de
- added four missing xsl files
- removed JAVA_HOME magic
-------------------------------------------------------------------
Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de
- added four missing xsl files
- removed JAVA_HOME magic
-------------------------------------------------------------------
Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de
- added BuildRoot
- removed JAVA_HOME magic
-------------------------------------------------------------------
Tue Jan 25 13:24:00 CET 2006 - dbornkessel@suse.de
- build optional task in an extra spec file due to circular dependencies
-------------------------------------------------------------------
Tue Jan 24 16:55:46 CET 2006 - dbornkessel@suse.de
- Not dependend on xml-commons-apis, which are provided by xerces-j2, which does not
depend on ant package (in contrast to old dependency on
xml-commons-apis <-> ant)
- optional task are now again in extra spec file ant-antlr
- only ant-antlr updates
-------------------------------------------------------------------
Thu Feb 2 20:55:06 CET 2006 - dbornkessel@suse.de
- fixed rpmlint errors and warnings
-------------------------------------------------------------------
Tue Jan 31 17:29:45 CET 2006 - dbornkessel@suse.de
- only ant-antlr updates
-------------------------------------------------------------------
Fri Jan 27 12:12:48 CET 2006 - dbornkessel@suse.de
- added four missing xsl files
- removed JAVA_HOME magic
-------------------------------------------------------------------
Tue Jan 24 16:55:46 CET 2006 - dbornkessel@suse.de
@ -418,18 +486,6 @@ Thu Jan 19 14:10:18 CET 2006 - dbornkessel@suse.de
dependency loop ... jpackage BuildRequires were wrong.
- updated to version 1.6.5
-------------------------------------------------------------------
Thu Jan 19 14:10:18 CET 2006 - dbornkessel@suse.de
- Integrated ant and ant-antlr again in one spec file as there is no
dependency loop ... jpackage BuildRequires were wrong.
- updated to version 1.6.5
-------------------------------------------------------------------
Mon Dec 19 10:46:33 CET 2005 - dbornkessel@suse.de
- added if statement that hinders unwanted creation of a file within a for loop
-------------------------------------------------------------------
Mon Dec 19 10:46:33 CET 2005 - dbornkessel@suse.de
@ -440,16 +496,6 @@ Thu Sep 29 00:10:39 CEST 2005 - dmueller@suse.de
- add norootforbuild
-------------------------------------------------------------------
Thu Sep 29 00:10:39 CEST 2005 - dmueller@suse.de
- add norootforbuild
-------------------------------------------------------------------
Fri Mar 4 13:53:08 CET 2005 - skh@suse.de
- rely on jpackage-utils' java-functions to set JAVA_HOME correctly
-------------------------------------------------------------------
Fri Mar 4 13:53:08 CET 2005 - skh@suse.de
@ -470,4 +516,3 @@ Thu Sep 2 15:58:19 CEST 2004 - skh@suse.de
- split off optional tasks into separate package to solve build
dependency loop in JPackage

4
ant-antlr.spec
View File

@ -36,7 +36,7 @@
%global major_version 1.9
Name: ant-antlr
Version: 1.9.4
Version: 1.9.6
Release: 0
Summary: Antlr Task for ant
License: Apache-2.0
@ -429,7 +429,7 @@ build-jar-repository -s -p lib/optional junit4
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-commons-resolver
%endif
# Fix file-not-utf8 rpmlint warning

12
ant-junit.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Jul 29 11:12:50 UTC 2015 - tchvatal@suse.com
- Add xalan-j2-serializer to ant-antlr requirements
-------------------------------------------------------------------
Tue Jul 28 14:15:24 UTC 2015 - tchvatal@suse.com
- Sync the changes files among the subpkgs
- Version bump to 1.9.6:
* Read WHATSNEW file for full changelist
-------------------------------------------------------------------
Sun Jun 21 14:05:05 UTC 2015 - jengelh@inai.de

4
ant-junit.spec
View File

@ -36,7 +36,7 @@
%global major_version 1.9
Name: ant-junit
Version: 1.9.4
Version: 1.9.6
Release: 0
Summary: Optional junit tasks for ant
License: Apache-2.0
@ -429,7 +429,7 @@ build-jar-repository -s -p lib/optional junit4
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-commons-resolver
%endif
# Fix file-not-utf8 rpmlint warning

12
ant.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Jul 29 11:12:50 UTC 2015 - tchvatal@suse.com
- Add xalan-j2-serializer to ant-antlr requirements
-------------------------------------------------------------------
Tue Jul 28 14:15:24 UTC 2015 - tchvatal@suse.com
- Sync the changes files among the subpkgs
- Version bump to 1.9.6:
* Read WHATSNEW file for full changelist
-------------------------------------------------------------------
Sun Jun 21 14:05:05 UTC 2015 - jengelh@inai.de

51
ant.keyring
View File

@ -1,9 +1,17 @@
pub 4096R/82A7FBCD 2010-11-02
uid Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
sub 4096R/70EC4C9A 2010-11-02
pub rsa4096/82A7FBCD 2010-11-02
uid [ unknown] Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
sub rsa4096/70EC4C9A 2010-11-02
pub dsa1024/5F6B8B72 2001-05-28
uid [ unknown] Stefan Bodewig <bodewig@apache.org>
uid [ revoked] Stefan Bodewig <bodewig@bost.de>
uid [ unknown] Stefan Bodewig <stefan@samaflost.de>
uid [ revoked] Stefan Bodewig <stefan.bodewig@epost.de>
uid [ unknown] Stefan Bodewig <stefan.bodewig@freenet.de>
sub elg1024/24774157 2001-05-28
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)
Version: GnuPG v2
mQINBEzPi28BEADeWUYA+LGSegpcaFo5ZjDNXPet9v4rJ81yTLp5GXggN4I8fvro
WXsQnUg9+mkGe3QBUsL6ySx0a47LM5f7nNR+xWgZpGexPLIzSP6LpVLTIXC3tE2M
@ -51,6 +59,37 @@ bM0Jf+BzjPrvVgbUphveFjgk+0/sqT3HxQT6VL8cela4likUF8ilJVQiVRE+FKQx
yMFVKSLJhZo8WX05YXu6Z8vP2tN/xJ7xiJri2KMYX8z91UWqa/On8ArHjMQD1t4J
5es7xmayDOmUtPbXckyDoh1BzHF71qcsXcPuxFx7p3KRAeZtFAovCwXg2KorVaqm
pIHShgJfKX8GiCfQ7BOUr/yByhZoni2vTxIf9kv+IQg99WrSCtz4pjhbq4Xm1N8D
lNMBJDW/9yGC5PjBUDg=
=gaRx
lNMBJDW/9yGC5PjBUDiZAaIEOxIiThEEANIKPqtSNXri1gIZPUNgphHsa2HJak10
YdJgtsRMFwNq0B7V3NDk2wKB+uXJt/J5j7LWXGvdP1up/rMlYPD/vXzB9/3qqaa/
WrN7FJi2YiuP6HndXzYRfBY4W5gwmKy7F1P3jSJDOiybcY6/gwl0SDegjZKB8TJF
BDq87g5vmscPAKDm1pmesc6tfHZ0gYfGnFFnRJSXfQP+Oa220WNg5DcsEyuKKTPm
aHawrdmehJEXijk7TNZV7p7ZIVc4SNWMiYqwfooJt1A16WsB2CLI6hcKXJAqxDbu
mdxt1ajps7QTc84llWZdp5buK50dWvretTk9WJc5shCt1CXQPn2PlusqPi92VPJT
DyRoc+9so8MQ7C9mrhgslDkEAIDViKVN5dEmrAWw2WlzEIfCVQsPhBRU/j3qmtBZ
/UHtnqDQq8satCw7RWclyf58Sq6TKxMmLFJcI95uiyW13hFqUki6lViSnjDowntu
JoMCUu42ENwj8CJdOZV1dR51Vchozwjc17beC5zBsDJzQe9v7dxIApGGX9rMVCG4
cG+WtCBTdGVmYW4gQm9kZXdpZyA8Ym9kZXdpZ0Bib3N0LmRlPohqBDARAgAqBQJC
4TgQIx0gVGhpcyB3YXMgYSBqb2IgYWRkcmVzcyBhbmQgSSBxdWl0AAoJEKIRWuFf
a4ty8RgAoIkPsJWmvYjDrnuQ7obcizzEproiAKCJK3ImBTn91QQQ9By1nxlVlKsc
0bQjU3RlZmFuIEJvZGV3aWcgPGJvZGV3aWdAYXBhY2hlLm9yZz6IaAQTEQIAIAIX
gAIZAQUCSgkegwULCQgHAwQVCgkIBRYCAwEAAh4BABIHZUdQRwABAQkQohFa4V9r
i3IWMwCghs0wCe4gGMPBq6jtBXK46e4aHKIAoNn+9NX6NlhF04qaHyDBhXK2HMmu
tCRTdGVmYW4gQm9kZXdpZyA8c3RlZmFuQHNhbWFmbG9zdC5kZT6IYAQTEQIAIAIb
AwIeAQIXgAUCSgkeigULCQgHAwQVCgkIBRYCAwEAAAoJEKIRWuFfa4tyhgIAoLgo
1NwHCM4Qh8w6AWwXe5NBO8vlAJ9Db3rSMaKz0nJ70vL98jUIExVDGLQoU3RlZmFu
IEJvZGV3aWcgPHN0ZWZhbi5ib2Rld2lnQGVwb3N0LmRlPoh3BDARAgA3BQJCxUrq
MB0gSSBubyBsb25nZXIgaGF2ZSBhY2Nlc3MgdG8gdGhhdCBlbWFpbCBhZGRyZXNz
LgAKCRCiEVrhX2uLctbvAJ0RzqF0KvT3hrwsb5yFN347MbF8VQCdHcW+24byy/fr
sqeTTJsyek4z/iG0KlN0ZWZhbiBCb2Rld2lnIDxzdGVmYW4uYm9kZXdpZ0BmcmVl
bmV0LmRlPohgBBMRAgAgAhsDAh4BAheABQJKCR6KBQsJCAcDBBUKCQgFFgIDAQAA
CgkQohFa4V9ri3LpKgCfZfhzR05NCnR2T6h+88My01YFshcAoN2tICdI/+Jpcii5
OD2dwARGdcWCuQENBDsSIlQQBADNUpZLxCuTKzJ1tMm7b/XjAhvPYKiL3doAZ6XA
LBdLF/nQmlh1jcuRy93QWpPxtwSfPjcwJLHy+Uq5tC1SnH1YwYhviLG1KEsniUBr
oUmV2HJyHP92fFI3LPk3xbqxvLh1NXFpzSuWjGMA66sZqeEbtMy2B8OLRwQShdHI
BWgrIwADBQP+PWkmbg2mraaUmgTswre8CGArBgcV+WYm6yaq9IC1G4V1PXmlswms
DlsAr6UDdJU46GFZMIi2WmFJHarEkIBwFN44ypSLmiEVwKRJE2/CYO0f7zQHcF6G
USwQo2TxneahrZyHs7GdvpcRcfm0YnlC/H1CJ3pl8FpfHttzzIrIJviITgQYEQIA
BgUCOxIiVAASCRCiEVrhX2uLcgdlR1BHAAEBDTIAoJ3NtpI/E345LVOruElFKrnd
uWWXAJ9Adm9Mz4yoxrosHSkp5BWzXBUt4A==
=3mc+
-----END PGP PUBLIC KEY BLOCK-----

4
ant.spec
View File

@ -35,7 +35,7 @@
%global major_version 1.9
Name: ant
Version: 1.9.4
Version: 1.9.6
Release: 0
Summary: Java-based build tool
License: Apache-2.0
@ -428,7 +428,7 @@ build-jar-repository -s -p lib/optional junit4
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-commons-resolver
%endif
# Fix file-not-utf8 rpmlint warning

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

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

17
apache-ant-1.9.4-src.tar.bz2.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: BCPG v1.29
iQIcBAABAgAQBQJTYGtfCRBe+tn+gqf7zQAAQlsP/1wBDMlEe+SJWOStHB9rYAVz
lv27ZTT0GXyTFv0Ex3ue9PtV4azoLByToMeMeClgjWN6nUUEkynrzqKlFuXTDBg8
d+UPUbBh1Jsgjl3hmF+yQXrXEyU/WIg2W1RbXUB78k/lKPTo6AZvlauGYKpTPlA0
qnsScqxZ9e0L1y+SyiJ4Wtdk402NU4cpEoIj0RFgJmoRFxuk38z3iTidTmtiCkoD
EV+wfp66mJ4Tbf/A5Pw0t0SwPKD6VElAZ09MYjYlzQRZhfFx+eUjVANJ9RGdIeKh
38PFEz9lT6u8fUpbkJycDosrCo8a281plT9NkoyMPlcGS/Kiw6TTI3oAeXGh6stQ
G43K+4ck2nfCXO+BN8fi28RV/Z+McLCw1itV6+pVo9EEUYzOhGTTZQ+2AuDY0LEM
GGiookw+kKeypPcE4LAAoXGzdQ6yaUtntI3eTFiCgIg/GfJQ+X0ynyvfNP85WnVf
vHAUKTsev0gczD/ktlWGOcT6CQgOEfoi0oCgjPkDvTki6UInjC7DAHYVjoINMXEm
eu20V6YJv8aVkz3InUxuI/ZKt0lavs8CZPah72IY9a2De7+NX/oOKmyo5M975Wkh
1w94FJW+8PtuhVucCY/Ku0nrdwPePiJyWcyko/IhZqwHoXHvZ7hRhTh5Z9rTkg17
fxrlBOMPDuAczLOZFqKC
=v3Yu
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlWQ0NgACgkQohFa4V9ri3IODACdFpgbfaQV8W1WqECEJjwd/W4O
kqAAmwb7sak1nWioHVp3n8U2/vA89mEi
=bOy8
-----END PGP SIGNATURE-----

2
pre_checkin.sh
View File

@ -5,6 +5,7 @@ sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/;
s/^\(Name:.*\)$/\1-antlr/;
0,/^Summary:.*/{s/^Summary:.*/Summary: Antlr Task for ant/};
" < ant.spec > ant-antlr.spec
cp ant.changes ant-antlr.changes
sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/;
s/^%bcond_with junit/%bcond_without junit/;
s/^\(Name:.*\)$/\1-junit/;
@ -12,4 +13,3 @@ sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/;
" < ant.spec > ant-junit.spec
cp ant.changes ant-junit.changes