rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge with upstream for upgrade

Browse Source
This commit is contained in:
Fernando Nasser 2007-07-20 20:57:49 +00:00
parent daaede44f9
commit 5277cfe3f3
9 changed files with 177 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
apache-ant-1.6.5-src.tar.gz
apache-ant-1.7.0-src.tar.gz

553
ant.spec
View File

File diff suppressed because it is too large Load Diff

12
apache-ant-1.6.5-endorsed.patch
View File

@ -1,12 +0,0 @@
--- ./src/script/ant 2007-02-20 22:52:16.000000000 -0500
+++ ./src/script/ant 2007-02-20 22:52:34.000000000 -0500
@@ -292,6 +292,9 @@ else
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
+
+ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=/usr/share/java/ant/endorsed"
+
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_args"
if $ant_exec_debug ; then
echo $ant_exec_command

22
apache-ant-1.6.5-javah.patch
View File

@ -1,22 +0,0 @@
--- 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");

22
apache-ant-1.6.5-jvm1.5-detect.patch
View File

@ -1,22 +0,0 @@
--- ./src/main/org/apache/tools/ant/util/JavaEnvUtils.java.sav 2006-05-31 18:18:10.000000000 -0400
+++ ./src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2006-05-31 18:18:18.000000000 -0400
@@ -95,7 +95,7 @@
Class.forName("java.lang.CharSequence");
javaVersion = JAVA_1_4;
javaVersionNumber++;
- Class.forName("java.lang.Readable");
+ Class.forName("java.net.Proxy");
javaVersion = JAVA_1_5;
javaVersionNumber++;
} catch (Throwable t) {
--- ./build.xml.sav 2006-05-31 18:18:28.000000000 -0400
+++ ./build.xml 2006-05-31 18:18:37.000000000 -0400
@@ -365,7 +365,7 @@
<target name="check_for_optional_packages">
<available property="jdk1.3+" classname="java.lang.StrictMath"/>
<available property="jdk1.4+" classname="java.lang.CharSequence"/>
- <available property="jdk1.5+" classname="java.lang.Readable"/>
+ <available property="jdk1.5+" classname="java.net.Proxy"/>
<available property="kaffe" classname="kaffe.util.NotImplemented"/>
<available property="bsf.present"
classname="org.apache.bsf.BSFManager"

31
apache-ant-1.6.5-rpm.patch
View File

@ -1,31 +0,0 @@
--- 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)"

0
apache-ant-1.6.2.ant.conf → apache-ant-1.7.ant.conf
View File

13
apache-ant-jars.patch
View File

@ -1,17 +1,14 @@
Some classes are included in more than one jar by accident. Left
unfixed, aot-compile-rpm will subset them.
--- apache-ant-1.6.2/build.xml~ 2005-07-18 10:22:08.000000000 +0100
+++ apache-ant-1.6.2/build.xml 2005-07-18 10:33:51.000000000 +0100
@@ -760,6 +760,7 @@
<selector refid="needs.jdk1.4+"/>
--- apache-ant-1.7.0/build.xml.orig 2007-06-20 14:17:16.000000000 -0400
+++ apache-ant-1.7.0/build.xml 2007-06-20 14:17:39.000000000 -0400
@@ -769,6 +769,7 @@
<selector refid="needs.jdk1.5+"/>
<selector refid="needs.javamail"/>
<selector refid="ant.launcher"/>
+ <selector refid="needs.apache-resolver"/>
</or>
</selector>
</not>
@@ -841,6 +842,7 @@
@@ -848,6 +849,7 @@
<selector refid="needs.jdepend"/>
<selector refid="needs.swing"/>
<selector refid="needs.jsch"/>

2
sources
View File

@ -1 +1 @@
b1a692367b4ef4d08833c434b4863ae9 apache-ant-1.6.5-src.tar.gz
769e022280e6bb1c9615adf336366e9f apache-ant-1.7.0-src.tar.gz