diff --git a/.cvsignore b/.cvsignore index 2c00163..96c15d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ apache-ant-1.6.2-src-RHCLEAN.tar.bz2 apache-ant-1.6.2 i386 *.src.rpm +apache-ant-1.6.5-src.tar.bz2 diff --git a/ant.spec b/ant.spec index b136c7b..fdbccb2 100644 --- a/ant.spec +++ b/ant.spec @@ -4,8 +4,8 @@ %define jpprelease 3jpp Name: ant -Version: 1.6.2 -Release: %{jpprelease}_15fc +Version: 1.6.5 +Release: 1fc Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -13,12 +13,14 @@ Summary(fr): Outil de compilation pour java License: Apache Software License URL: http://ant.apache.org/ Group: Development/Build Tools -Source0: apache-ant-1.6.2-src-RHCLEAN.tar.bz2 -Source2: apache-ant-%{version}.ant.conf -# Fix temp directory used for file containing large command strings (> 4k) -Patch0: apache-ant-%{version}.patch -Patch1: apache-ant-%{version}-rpm.patch -Patch3: apache-ant-bz157750.patch +Source0: apache-ant-%{version}-src.tar.bz2 +Source2: apache-ant-1.6.2.ant.conf +Patch1: apache-ant-1.6.5-rpm.patch +# javah: BZ 157750 +# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html +# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html +# Message-ID: <432A8E37.8050101@zarb.org> +Patch2: apache-ant-1.6.5-javah.patch Patch4: apache-ant-jars.patch Patch5: apache-ant-bz163689.patch Requires: jaxp_parser_impl @@ -47,7 +49,7 @@ jakarta and xml projects. %description -l fr Ant est un outil de compilation multi-plateformes pour java. Il est -utilisé par les projets apache-jakarta et apache-xml. +utilis� par les projets apache-jakarta et apache-xml. %description -l it Ant e' un tool indipendente dalla piattaforma creato per faciltare la @@ -359,14 +361,11 @@ Javadoc pour %{name}. %prep %setup -q -n apache-ant-%{version} -# Fix temp directory used for file containing large command strings (> 4k) -%patch0 -p1 - # Build OPT_JAR_LIST from the contents of /etc/ant.d/ %patch1 -p1 -# Build the javah task (#157750) and make it work with java-gcj-compat -%patch3 -p1 -b .orig +# #157750: make the javah task work with java-gcj-compat +%patch2 -p1 # Fix some places where copies of classes are included in the wrong jarfiles %patch4 -p1 -b .orig @@ -750,7 +749,13 @@ fi # ----------------------------------------------------------------------------- %changelog -* Thu Oct 27 2005 Vadim Nasardinov - 0:1.6.2-3jpp_15fc +* Mon Oct 31 2005 Vadim Nasardinov - 0:1.6.5-1fc +- Upgraded to 1.6.5 +- Removed apache-ant-1.6.2.patch. It was no longer relevant due to the + following change upstream: + src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v1.41.2.8 +- Updated apache-ant-1.6.2-rpm.patch to apache-ant-1.6.5-rpm.patch +- Replaced apache-ant-bz157750.patch with apache-ant-1.6.5-javah.patch - Converted this spec file from iso-8859-1 to utf-8. (#159586) * Wed Aug 3 2005 Gary Benson 0:1.6.2-3jpp_14fc @@ -859,10 +864,10 @@ fi - Update to 1.5.4 - JavaCC task fixed using merged upstream patches from ant HEAD -* Mon May 5 2003 Ville Skyttä - 0:1.5.3-2jpp +* Mon May 5 2003 Ville Skytt� - 0:1.5.3-2jpp - Fix non-versioned javadoc symlinking. -* Tue Apr 22 2003 Ville Skyttä - 0:1.5.3-1jpp +* Tue Apr 22 2003 Ville Skytt� - 0:1.5.3-1jpp - Update to 1.5.3. - Remove runtime java-devel dependency. - Add Epochs in all Provides and Requires. @@ -885,7 +890,7 @@ fi * Tue Mar 18 2003 Nicolas Mailhot - 1.5.2-7jpp - for JPackage-utils 1.5 -* Wed Mar 12 2003 Ville Skyttä - 1.5.2-5jpp +* Wed Mar 12 2003 Ville Skytt� - 1.5.2-5jpp - Move ANT_HOME to /usr/share/ant. - Don't special-case the lib dir for RPM layout any more, use ANT_HOME/lib. - Install XSLs into ANT_HOME/etc. @@ -915,7 +920,7 @@ fi ant optional jars) - Built with jikes 1.18 and IBM SDK 1.4 -* Sat Feb 1 2003 Ville Skyttä - 1.5.1-8jpp +* Sat Feb 1 2003 Ville Skytt� - 1.5.1-8jpp - Symlink a transformer into ANT_LIB for smoother experience on Java 1.3. - Requires jaxp_transform_impl. - Don't remove optional.jar symlinks on optional-full upgrade. @@ -927,14 +932,14 @@ fi * Mon Jan 20 2003 David Walluck 1.5.1-7jpp - oldbsf -* Fri Dec 20 2002 Ville Skyttä - 1.5.1-6jpp +* Fri Dec 20 2002 Ville Skytt� - 1.5.1-6jpp - Really get rid of automatic dependencies for the -scripts package. * Wed Dec 18 2002 Guillaume Rousse 1.5.1-5jpp - scripts subpackages - file-based manual dependencies, as packages doesn't have the same name on RedHat and Mandrake -* Wed Dec 11 2002 Ville Skyttä - 1.5.1-4jpp +* Wed Dec 11 2002 Ville Skytt� - 1.5.1-4jpp - Patched to allow easier use with Jikes and IBM's 1.4.0, see for details. @@ -966,7 +971,7 @@ fi * Thu Jul 11 2002 Henri Gomez 1.5-3jpp - add missing symlink between optional-full.jar and optional.jar -* Wed Jul 10 2002 Ville Skyttä 1.5-2jpp +* Wed Jul 10 2002 Ville Skytt� 1.5-2jpp - Requires jaxp_parser_impl, no longer jaxp_parser2 (jaxp_parser_impl already requires xml-commons-apis). - Use sed instead of bash 2 extension when symlinking. diff --git a/apache-ant-1.6.5-javah.patch b/apache-ant-1.6.5-javah.patch new file mode 100644 index 0000000..2de15e3 --- /dev/null +++ b/apache-ant-1.6.5-javah.patch @@ -0,0 +1,22 @@ +--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original 2005-10-31 15:05:55.000000000 -0500 ++++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2005-10-31 15:11:31.000000000 -0500 +@@ -104,7 +104,7 @@ + } + kaffeDetected = false; + try { +- Class.forName("kaffe.util.NotImplemented"); ++ Class.forName("gnu.classpath.Configuration"); + kaffeDetected = true; + } catch (Throwable t) { + // swallow as this simply doesn't seem to be Kaffe +--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original 2005-10-31 15:06:34.000000000 -0500 ++++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2005-10-31 15:08:13.000000000 -0500 +@@ -52,7 +52,7 @@ + + private Commandline setupKaffehCommand(Javah javah) { + Commandline cmd = new Commandline(); +- cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh")); ++ cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah")); + + if (javah.getDestdir() != null) { + cmd.createArgument().setValue("-d"); diff --git a/apache-ant-1.6.5-rpm.patch b/apache-ant-1.6.5-rpm.patch new file mode 100644 index 0000000..a225707 --- /dev/null +++ b/apache-ant-1.6.5-rpm.patch @@ -0,0 +1,31 @@ +--- apache-ant-1.6.5/src/script/ant.original 2005-10-27 17:06:55.000000000 -0400 ++++ apache-ant-1.6.5/src/script/ant 2005-10-27 17:08:45.000000000 -0400 +@@ -150,6 +150,28 @@ + # variable + if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then + LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" ++ ++ # If no optional jars have been specified then build the default list ++ if [ -z "$OPT_JAR_LIST" ] ; then ++ for file in /etc/ant.d/*; do ++ if [ -f "$file" ]; then ++ case "$file" in ++ *~) ;; ++ *#*) ;; ++ *.rpmsave) ;; ++ *.rpmnew) ;; ++ *) ++ for dep in `cat "$file"`; do ++ case "$OPT_JAR_LIST" in ++ *"$dep"*) ;; ++ *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep" ++ esac ++ done ++ esac ++ fi ++ done ++ fi ++ + # If the user requested to try to add some other jars to the classpath + if [ -n "$OPT_JAR_LIST" ] ; then + _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)" diff --git a/sources b/sources index d6ce919..cdf56c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -448e44d9c3ef0f29938ad8a3d30da534 apache-ant-1.6.2-src-RHCLEAN.tar.bz2 +80a7ad191c40b7d8c82533524b282b6b apache-ant-1.6.5-src.tar.bz2