From 625be8f8227038c41d7479761d8dff750be02213 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 15 Aug 2019 10:14:53 +0200
Subject: [PATCH] Update to upstream version 1.75

---
 .gitignore            |  1 +
 beust-jcommander.spec | 13 ++++++++-----
 generate-tarball.sh   | 28 ++++++++++++++++------------
 sources               |  2 +-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1caa32..ef472f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /1.66.tar.gz
 /1.71.tar.gz
 /beust-jcommander-1.71.tar.gz
+/beust-jcommander-1.75.tar.gz
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 18f5eba..7376434 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -1,6 +1,6 @@
 Name:           beust-jcommander
-Version:        1.71
-Release:        6%{?dist}
+Version:        1.75
+Release:        1%{?dist}
 Summary:        Java framework for parsing command line parameters
 License:        ASL 2.0
 URL:            http://jcommander.org/
@@ -10,10 +10,10 @@ BuildArch:      noarch
 Source0:        %{name}-%{version}.tar.gz
 # Adapted from earlier version that still shipped poms. It uses kobalt for building now
 Source1:        %{name}.pom
-# Cleaned up bundled jars hose licensing cannot be easily verified
+# Cleaned up bundled jars whose licensing cannot be easily verified
 Source2:        generate-tarball.sh
 
-Patch0: 0001-ParseValues-NullPointerException-patch.patch 
+Patch0:         0001-ParseValues-NullPointerException-patch.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
@@ -31,7 +31,7 @@ Summary:        API documentation for %{name}
 This package contains the %{summary}.
 
 %prep
-%setup -q -n jcommander-%{version}
+%setup -q
 %patch0 -p1
 
 chmod -x license.txt
@@ -52,6 +52,9 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
 %doc license.txt notice.md
 
 %changelog
+* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.75-1
+- Update to upstream version 1.75
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.71-6
 - Mass rebuild for javapackages-tools 201901
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index cb89cee..3b789d4 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -1,20 +1,24 @@
 #!/bin/bash
-set -e
 
-name=beust-jcommander
+# This commit refers to the state of the sources when they were published to
+# Maven Central
+git_tag='2d846a848c8d79283ab2ca8ffaa492ebbd505aec'
 version="$(sed -n 's/Version:\s*//p' *.spec)"
 
-# RETRIEVE
-wget "https://github.com/cbeust/jcommander/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+# Retrieve and set version
+git clone https://github.com/cbeust/jcommander.git
+cd jcommander
+git reset --hard "${git_tag}"
 
-rm -rf tarball-tmp
-mkdir tarball-tmp
-cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+# Clean
+find -name *.jar -delete
+find -name *.class -delete
+rm -rf gradle* kobalt* lib
 
-# CLEAN TARBALL
-rm -r */gradle* */kobalt* */lib
+rm -rf .git
 
-tar cf "../${name}-${version}.tar.gz" *
+# Pack into tarball
 cd ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
+mv jcommander beust-jcommander-"${version}"
+tar -cvf beust-jcommander-"${version}".tar.gz beust-jcommander-"${version}"/
+rm -rf beust-jcommander-"${version}"
diff --git a/sources b/sources
index fc08321..2ff0ec3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (beust-jcommander-1.71.tar.gz) = a3f7061f3afacd57092f62b9f8540a1f1e210ad6efc7f41ae10cee725a546b4cdcecee4a4f7056224936a59be18b11f2547002ec18be36626847b79a27a081d1
+SHA512 (beust-jcommander-1.75.tar.gz) = 3ff0489eed31cff99665d67f6d964b62b020fdddf09edd5137f0ae30905ae779fcda80b52be8ef7d50a2f66bcb4794b3a27127b2c97978fcd45254ee19e687cb