From f04f3bfd5e52f2100ac7e9e3ebc169e8cb19ba65 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Jan 24 2018 15:26:41 +0000
Subject: Fix FTBFS error resulting from deprecated JCommander usage


---

diff --git a/zxing-3.2.1-deprecated-JCommander-usage.patch b/zxing-3.2.1-deprecated-JCommander-usage.patch
new file mode 100644
index 0000000..a79dc7e
--- /dev/null
+++ b/zxing-3.2.1-deprecated-JCommander-usage.patch
@@ -0,0 +1,26 @@
+diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java
+--- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java	2015-08-19 07:21:00.000000000 -0500
++++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java	2018-01-24 08:59:39.472655785 -0600
+@@ -35,7 +35,8 @@
+ 
+   public static void main(String[] args) throws Exception {
+     EncoderConfig config = new EncoderConfig();
+-    JCommander jCommander = new JCommander(config, args);
++    JCommander jCommander = new JCommander(config);
++    jCommander.parse(args);
+     jCommander.setProgramName(CommandLineEncoder.class.getSimpleName());
+     if (config.help) {
+       jCommander.usage();
+diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java
+--- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java	2015-08-19 07:21:00.000000000 -0500
++++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java	2018-01-24 08:59:39.473655761 -0600
+@@ -49,7 +49,8 @@
+ 
+   public static void main(String[] args) throws Exception {
+     DecoderConfig config = new DecoderConfig();
+-    JCommander jCommander = new JCommander(config, args);
++    JCommander jCommander = new JCommander(config);
++    jCommander.parse(args);
+     jCommander.setProgramName(CommandLineRunner.class.getSimpleName());
+     if (config.help) {
+       jCommander.usage();
diff --git a/zxing.spec b/zxing.spec
index 863fd12..5984f9d 100644
--- a/zxing.spec
+++ b/zxing.spec
@@ -1,6 +1,6 @@
 Name:          zxing
 Version:       3.2.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Java multi-format 1D/2D bar-code image processing library
 License:       ASL 2.0
 URL:           https://github.com/zxing/zxing/
@@ -8,6 +8,9 @@ URL:           https://github.com/zxing/zxing/
 # sh zxing-repack.sh <VERSION>
 Source0:       %{name}-%{version}.tar.xz
 Source1:       zxing-repack.sh
+# FTBFS fix manually cherry picked from upstream commit
+#   https://github.com/zxing/zxing/commit/e2afb336e2f7afaa9d0895c4d16e9e85013c2f3d
+Patch0:        zxing-3.2.1-deprecated-JCommander-usage.patch
 
 BuildRequires: maven-local
 BuildRequires: mvn(com.beust:jcommander)
@@ -43,6 +46,7 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
+%patch0
 
 %pom_remove_dep com.google.android:
 %pom_remove_dep :android-core
@@ -128,6 +132,9 @@ sed -i '/Code39ExtendedBlackBox2TestCase/d' core/src/test/java/com/google/zxing/
 %license COPYING NOTICE
 
 %changelog
+* Wed Jan 24 2018 Merlin Mathesius <mmathesi@redhat.com> - 3.2.1-6
+- Fix FTBFS error resulting from deprecated JCommander usage
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild