rpms/ant/devel apache-ant-r529855.patch, NONE, 1.1 ant.spec, 1.89, 1.90

[Permaine Cheung (pcheung)]

Author: pcheung

Update of /cvs/extras/rpms/ant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321

Modified Files:
	ant.spec 
Added Files:
	apache-ant-r529855.patch 
Log Message:
make Java 6's javac understand -source 1.1 as well


apache-ant-r529855.patch:

--- NEW FILE apache-ant-r529855.patch ---
Index: src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
===================================================================
--- src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java        (revision 529854)
+++ src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java        (revision 529855)
@@ -321,10 +321,10 @@
         if (attributes.getSource() != null && !assumeJava13()) {
             cmd.createArgument().setValue("-source");
             String source = attributes.getSource();
-            if ((assumeJava14() || assumeJava15())
-                && (source.equals("1.1") || source.equals("1.2"))) {
+            if (source.equals("1.1") || source.equals("1.2")) {
                 // support for -source 1.1 and -source 1.2 has been
-                // added with JDK 1.4.2 - and isn't present in 1.5.0 either
+                // added with JDK 1.4.2 - and isn't present in 1.5.0
+                // or 1.6.0 either
                 cmd.createArgument().setValue("1.3");
             } else {
                 cmd.createArgument().setValue(source);


Index: ant.spec
===================================================================
RCS file: /cvs/extras/rpms/ant/devel/ant.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ant.spec	16 Aug 2007 13:32:57 -0000	1.89
+++ ant.spec	9 Jan 2008 14:00:09 -0000	1.90
@@ -55,7 +55,7 @@
 
 Name:           ant
 Version:        1.7.0
-Release:        %{jpprelease}.2%{?dist}
+Release:        %{jpprelease}.3%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -73,6 +73,7 @@
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch4:         apache-ant-jars.patch
 Patch5:         apache-ant-bz163689.patch
+Patch6:         apache-ant-r529855.patch
 
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.6
@@ -616,6 +617,9 @@
 #%patch5 -p1 -b .orig
 #%endif
 
+# Patch to make Java 6's javac understand -source 1.2
+%patch6 -p0
+
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -1365,6 +1369,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jan 09 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.3
+- make Java 6's javac understand -source 1.1 as well (patch from bodewig 
+  on the ant mailing list)
+
 * Tue Aug 14 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.7.0-1jpp.2
 - Enable building commons-net subpackage