From c616bba68385c8b32165006132f63c12bafb694d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:25 +0200 Subject: [PATCH 1/7] Mass rebuild for javapackages-tools 201901 --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index bd361c5..18f5eba 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,6 +1,6 @@ Name: beust-jcommander Version: 1.71 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -52,6 +52,9 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %doc license.txt notice.md %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.71-6 +- Mass rebuild for javapackages-tools 201901 + * Mon Jul 30 2018 Michael Simacek - 1.71-5 - Repack the tarball without binaries From 625be8f8227038c41d7479761d8dff750be02213 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 15 Aug 2019 10:14:53 +0200 Subject: [PATCH 2/7] 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 - 1.75-1 +- Update to upstream version 1.75 + * Fri May 24 2019 Mikolaj Izdebski - 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 From 42a5f55adc8613f875a92a5119c4424a70838e9c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 15 Aug 2019 13:38:19 +0200 Subject: [PATCH 3/7] Improve generate-tarball.sh --- generate-tarball.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 3b789d4..d72b53c 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # This commit refers to the state of the sources when they were published to # Maven Central git_tag='2d846a848c8d79283ab2ca8ffaa492ebbd505aec' @@ -7,18 +9,19 @@ version="$(sed -n 's/Version:\s*//p' *.spec)" # Retrieve and set version git clone https://github.com/cbeust/jcommander.git -cd jcommander + +pushd jcommander git reset --hard "${git_tag}" # Clean -find -name *.jar -delete -find -name *.class -delete +find -name '*.jar' -delete +find -name '*.class' -delete rm -rf gradle* kobalt* lib rm -rf .git +popd # Pack into tarball -cd .. mv jcommander beust-jcommander-"${version}" tar -cvf beust-jcommander-"${version}".tar.gz beust-jcommander-"${version}"/ rm -rf beust-jcommander-"${version}" From 8af5a3f73635afe42b19b93b853927a27bca64cc Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 2 Sep 2019 09:55:15 +0200 Subject: [PATCH 4/7] Update to upstream version 1.78 --- .gitignore | 1 + beust-jcommander.spec | 5 ++++- generate-tarball.sh | 3 +-- sources | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ef472f1..67d7bbc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /1.71.tar.gz /beust-jcommander-1.71.tar.gz /beust-jcommander-1.75.tar.gz +/beust-jcommander-1.78.tar.gz diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 7376434..3c3d952 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,5 +1,5 @@ Name: beust-jcommander -Version: 1.75 +Version: 1.78 Release: 1%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 @@ -52,6 +52,9 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %doc license.txt notice.md %changelog +* Mon Sep 02 2019 Marian Koncek - 1.78-1 +- Update to upstream version 1.78 + * Thu Aug 15 2019 Marian Koncek - 1.75-1 - Update to upstream version 1.75 diff --git a/generate-tarball.sh b/generate-tarball.sh index d72b53c..034b6b3 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -4,7 +4,7 @@ set -e # This commit refers to the state of the sources when they were published to # Maven Central -git_tag='2d846a848c8d79283ab2ca8ffaa492ebbd505aec' +git_tag='dcf154b6d40dd3865e317de7250b7019044543a9' version="$(sed -n 's/Version:\s*//p' *.spec)" # Retrieve and set version @@ -17,7 +17,6 @@ git reset --hard "${git_tag}" find -name '*.jar' -delete find -name '*.class' -delete rm -rf gradle* kobalt* lib - rm -rf .git popd diff --git a/sources b/sources index 2ff0ec3..0be1842 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beust-jcommander-1.75.tar.gz) = 3ff0489eed31cff99665d67f6d964b62b020fdddf09edd5137f0ae30905ae779fcda80b52be8ef7d50a2f66bcb4794b3a27127b2c97978fcd45254ee19e687cb +SHA512 (beust-jcommander-1.78.tar.gz) = 618367d1644bf0423c3184bd4a6be73571c1b2de243bb7dad4e72d5a3023bf30116c0e5337088e0e4d1f42f24ba94b0fddaedcd3e54613c335d068edeaddfaef From ae0d10d16fff0c31cd4fd85ca60119f50fdf1d00 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 5/7] Mass rebuild for javapackages-tools 201902 --- beust-jcommander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 3c3d952..e2ed2fe 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,6 +1,6 @@ Name: beust-jcommander Version: 1.78 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -52,6 +52,9 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %doc license.txt notice.md %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.78-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Sep 02 2019 Marian Koncek - 1.78-1 - Update to upstream version 1.78 From 6b46ae68a2f700016d153c78c4b57f129592d28b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 6/7] Conditionalize buildrequires in bootstrap mode --- beust-jcommander.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index e2ed2fe..2f0b1d7 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: beust-jcommander Version: 1.78 Release: 2%{?dist} @@ -16,9 +18,13 @@ Source2: generate-tarball.sh Patch0: 0001-ParseValues-NullPointerException-patch.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.testng:testng) +%endif %description JCommander is a very small Java framework that makes it trivial to From 11bc665821c5b69ab1e4def42ed8819353ca88b2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 7/7] Turn off bootstrap mode by default --- beust-jcommander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 2f0b1d7..be74826 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: beust-jcommander Version: 1.78