From ac4a12b4036b65bcf93c05fd7db5fb46dd842215 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Jan 31 2012 22:13:16 +0000
Subject: Apply upstream source encoding patch to fix build with java 1.7.


---

diff --git a/args4j-srcencoding.patch b/args4j-srcencoding.patch
new file mode 100644
index 0000000..da4ba1e
--- /dev/null
+++ b/args4j-srcencoding.patch
@@ -0,0 +1,91 @@
+diff --git a/args4j/src/org/kohsuke/args4j/ClassParser.java b/args4j/src/org/kohsuke/args4j/ClassParser.java
+index 1f25aa3..047415e 100644
+--- a/args4j/src/org/kohsuke/args4j/ClassParser.java
++++ b/args4j/src/org/kohsuke/args4j/ClassParser.java
+@@ -11,7 +11,7 @@
+  *
+  * This can be used to feed option bindings that span across multiple instances.
+  *
+- * @author Jan Mat�rne
++ * @author Jan Materne
+  */
+ public class ClassParser {
+     public void parse(Object bean, CmdLineParser parser) {
+diff --git a/args4j/src/org/kohsuke/args4j/Config.java b/args4j/src/org/kohsuke/args4j/Config.java
+index bf594b6..0aa5888 100644
+--- a/args4j/src/org/kohsuke/args4j/Config.java
++++ b/args4j/src/org/kohsuke/args4j/Config.java
+@@ -17,7 +17,7 @@
+  * Metadataconfiguration.
+  * This class holds all metadata for a class, mainly a list of @Options and @Arguments.
+  *
+- * @author Jan Mat�rne
++ * @author Jan Materne
+  */
+ public class Config {
+ 
+@@ -31,7 +31,7 @@
+ 	/**
+ 	 * The ConfigElement is an <tt>&lt;option></tt> or <tt>&lt;argument></tt> tag
+ 	 * in the xml configuration file.
+-	 * @author Jan Mat�rne
++	 * @author Jan Materne
+ 	 */
+ 	public class ConfigElement {
+ 		public String field;
+@@ -54,7 +54,7 @@ public boolean isInvalid() {
+ 
+ 	/**
+ 	 * SAX-Handler for reading the configuration file.
+-	 * @author Jan Mat�rne
++	 * @author Jan Materne
+ 	 */
+ 	public class ConfigHandler extends DefaultHandler {
+ 		public ConfigHandler(Config config) {
+diff --git a/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties b/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties
+index ab51cee..8483207 100644
+--- a/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties
++++ b/args4j/src/org/kohsuke/args4j/Messages_de_DE.properties
+@@ -1,17 +1,25 @@
++# Unicode for Umlauts
++#   Ae, ae     \u00c4, \u00e4
++#   Oe, oe     \u00d6, \u00f6
++#   Ue, ue     \u00dc, \u00fc
++#   ss         \u00df
++
++
++
+ MISSING_OPERAND = \
+-    Option "{0}" ben�tigt einen Operanden
++    Option "{0}" ben\u00f6tigt einen Operanden
+ 
+ UNDEFINED_OPTION = \
+-    "{0}" ist keine g�ltige Option
++    "{0}" ist keine g\u00fcltige Option
+ 
+ NO_ARGUMENT_ALLOWED = \
+     Kein Argument erlaubt: {0}
+ 
+ REQUIRED_OPTION_MISSING = \
+-    Option "{0}" wird ben�tigt
++    Option "{0}" wird ben\u00f6tigt
+     
+ REQUIRED_ARGUMENT_MISSING = \
+-    Argument "{0}" wird ben�tigt
++    Argument "{0}" wird ben\u00f6tigt
+     
+ TOO_MANY_ARGUMENTS = \
+     Zu viele Argumente: {0}
+diff --git a/args4j/src/org/kohsuke/args4j/XmlParser.java b/args4j/src/org/kohsuke/args4j/XmlParser.java
+index d4fd9b6..eb51bb9 100644
+--- a/args4j/src/org/kohsuke/args4j/XmlParser.java
++++ b/args4j/src/org/kohsuke/args4j/XmlParser.java
+@@ -37,7 +37,7 @@
+  * &lt;args>
+  * </pre>
+  *
+- * @author Jan Mat�rne
++ * @author Jan Materne
+  */
+ public class XmlParser {
+     public void parse(URL xml, CmdLineParser parser, Object bean) {
diff --git a/args4j.spec b/args4j.spec
index ccf4d18..fb8f128 100644
--- a/args4j.spec
+++ b/args4j.spec
@@ -6,7 +6,7 @@ Name:              args4j
 %global site_name  %{name}-site
 
 Version:          2.0.16
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Small Java lib that makes it easy to parse command line options/args in CUI apps
 License:          MIT and BSD
 Group:            Development/Libraries
@@ -20,6 +20,8 @@ Source0:          %{name}-%{version}.tar.xz
 Patch0:           %{name}-wagon-svn-removal.patch
 Patch1:           %{name}-ant-removal.patch
 Patch2:           %{name}-osgi.patch
+# https://github.com/kohsuke/args4j/commit/fc85e79
+Patch3:           %{name}-srcencoding.patch
 
 BuildArch:        noarch
 
@@ -59,6 +61,7 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # removing classpath addition
 sed -i 's/<addClasspath>true/<addClasspath>false/g' %{tools_name}/pom.xml
@@ -111,6 +114,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 31 2012 Ville Skyttä <ville.skytta@iki.fi> - 2.0.16-6
+- Apply upstream source encoding patch to fix build with java 1.7.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild