[ecj/f18] New patches missing from previous change.

[Jon VanAlten]

commit d204733ca57d7e5a7d86dc2235b2ca274410bd9c
Author: Jon VanAlten <jon.vanalten at redhat.com>
Date:   Wed Oct 10 22:47:22 2012 -0400

    New patches missing from previous change.

 ecj-include-props.patch       |   10 ++++++++++
 ecj.spec                      |    5 ++++-
 eclipse-gcj-compat4.2.1.patch |   20 ++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/ecj-include-props.patch b/ecj-include-props.patch
new file mode 100644
index 0000000..990442c
--- /dev/null
+++ b/ecj-include-props.patch
@@ -0,0 +1,10 @@
+--- a/build.xml	2012-10-09 13:56:47.695928242 -0400
++++ b/build.xml	2012-10-09 13:57:06.822893233 -0400
+@@ -46,6 +46,7 @@
+ 				<include name="**/*.rsc"/>
+ 				<include name="META-INF/**"/>
+ 				<include name="**/*.properties"/>
++				<include name="**/*.props"/>
+ 				<exclude name="META-INF/eclipse.inf"/>
+ 			</fileset>
+ 		</zip>
diff --git a/ecj.spec b/ecj.spec
index 584c68b..f5e7038 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -8,7 +8,7 @@ Epoch: 1
 Summary: Eclipse Compiler for Java
 Name: ecj
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.eclipse.org
 License: EPL
 Group: Development/Languages
@@ -141,6 +141,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Wed Oct 10 2012 Jon VanAlten <jon.vanalten at redhat.com> 1:4.2.1-2
+- New patches missing from previous change.
+
 * Wed Oct 10 2012 Jon VanAlten <jon.vanalten at redhat.com> 1:4.2.1-1
 - Update to 4.2.1 upstream version.
 
diff --git a/eclipse-gcj-compat4.2.1.patch b/eclipse-gcj-compat4.2.1.patch
new file mode 100644
index 0000000..17b5192
--- /dev/null
+++ b/eclipse-gcj-compat4.2.1.patch
@@ -0,0 +1,20 @@
+diff -u -r org/eclipse/jdt/internal/compiler/batch/GCCMain.java org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+--- a/org/eclipse/jdt/internal/compiler/batch/GCCMain.java	2008-08-13 13:46:30.000000000 -0400
++++ b/org/eclipse/jdt/internal/compiler/batch/GCCMain.java	2012-04-26 13:36:21.268642702 -0400
+@@ -29,6 +29,7 @@
+ import org.eclipse.jdt.internal.compiler.env.AccessRule;
+ import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
+ import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
++import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
+ import org.eclipse.jdt.internal.compiler.util.Messages;
+ import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
+ 
+@@ -463,7 +464,7 @@
+ 		}
+ 
+ 		if (inhibitAllWarnings)
+-			disableWarnings();
++			disableAll(ProblemSeverities.Warning);
+ 		if (treatWarningsAsErrors)
+ 			turnWarningsToErrors();
+