Browse Source

upgrading package: ant 1.9.6 -> 1.9.7

master
parent
commit
d4ca08d94e
  1. 12
      ant/ant.patch
  2. 6
      ant/ant.spec

12
ant/ant.patch

@ -1,7 +1,7 @@
Index: bin/ant
--- bin/ant.orig 2010-02-02 01:35:22.000000000 +0100
+++ bin/ant 2010-05-02 21:35:32.000000000 +0200
@@ -316,7 +316,7 @@
--- bin/ant.orig 2016-04-09 08:38:27.000000000 +0200
+++ bin/ant 2016-04-13 20:21:17.289425523 +0200
@@ -318,7 +318,7 @@
fi
# Execute ant using eval/exec to preserve spaces in paths,
# java options, and ant args
@ -10,12 +10,12 @@ Index: bin/ant
if [ -n "$CYGHOME" ]; then
if [ -n "$JIKESPATH" ]; then
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\" -Dcygwin.user.home=\"$CYGHOME\""
@@ -328,7 +328,7 @@
@@ -330,7 +330,7 @@
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" -Dant.jar=\"$ANT_LIB/ant.jar\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
-ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
+ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" -Dant.jar=\"\$ANT_LIB/ant.jar\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
if $ant_exec_debug ; then
echo $ant_exec_command $ant_exec_args
fi

6
ant/ant.spec

@ -22,8 +22,8 @@
##
# package version
%define V_opkg 1.9.6
%define V_ant 1.9.6
%define V_opkg 1.9.7
%define V_ant 1.9.7
%define V_ivy 2.4.0
%define V_maven 2.1.3
%define V_junit 4.10
@ -39,7 +39,7 @@ Class: PLUS
Group: Building
License: Apache Software License
Version: %{V_opkg}
Release: 20150703
Release: 20160413
# package options
%option with_docs no

Loading…
Cancel
Save