From 737fd8869ba4c38058fa50cc89a57ac8643044e8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:15 +0200 Subject: [PATCH 1/8] Mass rebuild for javapackages-tools 201901 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 1e48468..480e9b6 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -40,6 +40,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.4-5 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 401e64ed1e4c2cdbc190b786179c514db440db2c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 08:51:39 +0200 Subject: [PATCH 2/8] Declare module package --- apache-commons-cli.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 480e9b6..7c4cb2d 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -20,6 +20,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) The CLI library provides a simple and easy to use API for working with the command line arguments and options. +%{?module_package} %{?javadoc_package} %prep @@ -35,7 +36,7 @@ command line arguments and options. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt %doc README.md RELEASE-NOTES.txt From 23ded8dcba4cc1db314f0a4b7509e9265170731b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 09:07:22 +0200 Subject: [PATCH 3/8] Use standard artifact installation location --- apache-commons-cli.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 7c4cb2d..a5b03c6 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -28,7 +28,6 @@ command line arguments and options. # Compatibility links %mvn_alias : org.apache.commons:commons-cli -%mvn_file : commons-cli %{name} %build %mvn_build From a13a42ebbbaa2ca4d25382dde9a432a597aede15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:35:48 +0200 Subject: [PATCH 4/8] Revert "Use standard artifact installation location" This reverts commit 23ded8dcba4cc1db314f0a4b7509e9265170731b. --- apache-commons-cli.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index a5b03c6..7c4cb2d 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -28,6 +28,7 @@ command line arguments and options. # Compatibility links %mvn_alias : org.apache.commons:commons-cli +%mvn_file : commons-cli %{name} %build %mvn_build From 80746f927678f76adef547f1d4cbe0c142c3ac6f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 18:49:09 +0200 Subject: [PATCH 5/8] Set compiler source/target to 1.6 --- apache-commons-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 7c4cb2d..bcfdf25 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -31,7 +31,7 @@ command line arguments and options. %mvn_file : commons-cli %{name} %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 %install %mvn_install From b13b808eba27040267403506ba9de5eea1e08921 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 6/8] Mass rebuild for javapackages-tools 201902 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index bcfdf25..bbd53bb 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -41,6 +41,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.4-5 - Mass rebuild for javapackages-tools 201901 From 6a8172c412029f07bd6a5dba5930a0bc5424339b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 7/8] Build with OpenJDK 8 --- apache-commons-cli.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index bbd53bb..28e30fe 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -11,7 +11,7 @@ Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers # workaround for https://issues.apache.org/jira/browse/CLI-253 Patch0: CLI-253-workaround.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -41,6 +41,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-7 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 - Mass rebuild for javapackages-tools 201902 From 8c4200c91339a83c4a9df8c169600c97ffe48b4b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/8] Conditionalize buildrequires in bootstrap mode --- apache-commons-cli.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 28e30fe..b616228 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-cli Version: 1.4 Release: 7%{?dist} @@ -12,9 +14,13 @@ Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers Patch0: CLI-253-workaround.patch BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +%endif %description The CLI library provides a simple and easy to use API for working with the