commit ff8d9b2abafc31bf3d532d455c7b3906e3239dc1
Author: Ville Skyttä <ville.skytta(a)iki.fi>
Date: Wed Feb 1 00:31:39 2012 +0200
More src encoding fixes.
args4j-srcencoding.patch | 30 ++++++++++++++++++++++++++++++
args4j.spec | 6 +++---
2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/args4j-srcencoding.patch b/args4j-srcencoding.patch
index da4ba1e..e32244f 100644
--- a/args4j-srcencoding.patch
+++ b/args4j-srcencoding.patch
@@ -89,3 +89,33 @@ index d4fd9b6..eb51bb9 100644
*/
public class XmlParser {
public void parse(URL xml, CmdLineParser parser, Object bean) {
+diff -up args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java~
args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java
+--- args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java~ 2012-02-01
00:25:06.619059734 +0200
++++ args4j-2.0.16/args4j/src/org/kohsuke/args4j/XmlParser.java 2012-02-01
00:28:06.611756117 +0200
+@@ -95,7 +95,7 @@ public class XmlParser {
+
+ /**
+ * Implementation of @Option so we can instantiate it.
+- * @author Jan Mat�rne
++ * @author Jan Materne
+ */
+ class OptionImpl extends AnnotationImpl implements Option {
+ protected OptionImpl(ConfigElement ce) throws ClassNotFoundException {
+@@ -111,7 +111,7 @@ public class XmlParser {
+
+ /**
+ * Implementation of @Argument so we can instantiate it.
+- * @author Jan Mat�rne
++ * @author Jan Materne
+ */
+ class ArgumentImpl extends AnnotationImpl implements Argument {
+ protected ArgumentImpl(ConfigElement ce) throws ClassNotFoundException {
+@@ -122,7 +122,7 @@ public class XmlParser {
+
+ /**
+ * Base class for the @Option and @Argument implementation classes.
+- * @author Jan Mat�rne
++ * @author Jan Materne
+ */
+ class AnnotationImpl {
+ protected AnnotationImpl(ConfigElement ce) throws ClassNotFoundException {
diff --git a/args4j.spec b/args4j.spec
index fb8f128..6c7f030 100644
--- a/args4j.spec
+++ b/args4j.spec
@@ -6,7 +6,7 @@ Name: args4j
%global site_name %{name}-site
Version: 2.0.16
-Release: 6%{?dist}
+Release: 7%{?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,7 +20,7 @@ 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
+#
https://github.com/kohsuke/args4j/commit/fc85e79 + some additions
Patch3: %{name}-srcencoding.patch
BuildArch: noarch
@@ -114,7 +114,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
-* Tue Jan 31 2012 Ville Skyttä <ville.skytta(a)iki.fi> - 2.0.16-6
+* Tue Jan 31 2012 Ville Skyttä <ville.skytta(a)iki.fi> - 2.0.16-7
- Apply upstream source encoding patch to fix build with java 1.7.
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.0.16-5