import CS ant-1.10.15-18.module_el9+1171+eb38a622

.ant.metadata

@@ -1 +1 @@
-24ceef44b43cd2726c865d0de5168a84a1cb30c7 SOURCES/apache-ant-1.10.7-src.tar.bz2
+1af047a4f58498c2f130a4cd576e39d528c82662 SOURCES/apache-ant-1.10.15-src.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/apache-ant-1.10.7-src.tar.bz2
+SOURCES/apache-ant-1.10.15-src.tar.bz2

SOURCES/ant-build.xml.patch

@@ -1,15 +1,6 @@
---- apache-ant-1.10.7/build.xml~	2019-10-31 14:10:07.739864466 +0100
-+++ apache-ant-1.10.7/build.xml	2019-10-31 14:10:12.018897830 +0100
-@@ -145,8 +145,6 @@
-      -->
-     <pathelement location="${src.junit}"/>
-     <pathelement location="${tests.etc.dir}"/>
--    <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
--    <pathelement location="${java.home}/../lib/tools.jar"/>
-   </path>
- 
-   <!--
-@@ -801,7 +799,6 @@
+--- ant/build.xml~	2021-05-17 12:32:48.406394876 +0200
++++ ant/build.xml	2021-05-17 12:32:39.990389601 +0200
+@@ -819,7 +817,6 @@
        </metainf>
        <manifest>
          <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
@@ -17,29 +8,29 @@
        </manifest>
      </jar>
  
-@@ -1543,7 +1540,25 @@
-              maxmemory="1000M"
-              verbose="${javadoc.verbose}">
+@@ -1562,7 +1559,25 @@
+              verbose="${javadoc.verbose}"
+              additionalparam="${javadoc.doclint.none}">
  
 -      <packageset dir="${java.dir}"/>
 +      <fileset dir="${java.dir}">
-+	<include name="**/*.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
++        <include name="**/*.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
 +      </fileset>
  
        <!-- hide some meta information for javadoc -->

SOURCES/apache-ant-1.8.ant.conf

@@ -17,4 +17,8 @@ else
 
   # ANT_HOME for rpm layout
   ANT_HOME=/usr/share/ant
+
+  if [ -z "$JAVA_HOME" ] ; then
+    . /etc/java/ant.conf
+  fi
 fi