From 551ecb3d4329ac2be19e89f7d47b8f9974b36d8b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:44 +0000 Subject: [PATCH 1/7] Switch to SHA512 sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2013bd5..c636606 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7927e99a8033ac447c7c35d32e0ba9aa mojo-parent-40.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (mojo-parent-40.tar.gz) = 5860180e9999465ec9ed3010d832a98a6ecef0a45290f3f07b089d2145966fc0e43d7e24595c0ca2693966589e4cbe2062e20679868fe75f2bca57bd51cdd6e1 +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 533927cf81612d12bb07c1fd21d91a46d642583d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:21 +0200 Subject: [PATCH 2/7] Mass rebuild for javapackages-tools 201901 --- mojo-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mojo-parent.spec b/mojo-parent.spec index 763cf15..803ec41 100644 --- a/mojo-parent.spec +++ b/mojo-parent.spec @@ -1,6 +1,6 @@ Name: mojo-parent Version: 40 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Codehaus MOJO parent project pom file License: ASL 2.0 @@ -36,6 +36,9 @@ cp %SOURCE1 . %doc LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 40-7 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 40-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 93dde9d285f1e7bab3650718508dd427e9ed0364 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 3/7] Mass rebuild for javapackages-tools 201902 --- mojo-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mojo-parent.spec b/mojo-parent.spec index 803ec41..d62d3a6 100644 --- a/mojo-parent.spec +++ b/mojo-parent.spec @@ -1,6 +1,6 @@ Name: mojo-parent Version: 40 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Codehaus MOJO parent project pom file License: ASL 2.0 @@ -36,6 +36,9 @@ cp %SOURCE1 . %doc LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 40-8 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 40-7 - Mass rebuild for javapackages-tools 201901 From 71a4f70743304f125986199500710513d7c43a63 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 08:46:21 +0200 Subject: [PATCH 4/7] Update to upstream version 50 --- .gitignore | 1 + mojo-parent.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0b763ca..0887982 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ mojo-parent-29-source-release.zip /mojo-parent-39-source-release.zip /mojo-parent-40-source-release.zip /mojo-parent-40.tar.gz +/mojo-parent-50.tar.gz diff --git a/mojo-parent.spec b/mojo-parent.spec index d62d3a6..aa58d5d 100644 --- a/mojo-parent.spec +++ b/mojo-parent.spec @@ -1,12 +1,12 @@ Name: mojo-parent -Version: 40 -Release: 8%{?dist} +Version: 50 +Release: 1%{?dist} Summary: Codehaus MOJO parent project pom file License: ASL 2.0 -URL: http://www.mojohaus.org/mojo-parent/ +URL: https://www.mojohaus.org/mojo-parent/ Source0: https://github.com/mojohaus/mojo-parent/archive/%{name}-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local @@ -36,6 +36,9 @@ cp %SOURCE1 . %doc LICENSE-2.0.txt %changelog +* Wed Jul 29 2020 Marian Koncek - 50-1 +- Update to upstream version 50 + * Tue Nov 05 2019 Mikolaj Izdebski - 40-8 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index c636606..f952169 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mojo-parent-40.tar.gz) = 5860180e9999465ec9ed3010d832a98a6ecef0a45290f3f07b089d2145966fc0e43d7e24595c0ca2693966589e4cbe2062e20679868fe75f2bca57bd51cdd6e1 +SHA512 (mojo-parent-50.tar.gz) = 64b62629914776b7d139c5acee159f4a8d6dabc5885643f65724b7930fe6760e00d9dd92533806dea5deb2f187e0af0e5b6e356256944f0c8ad13dc2b5e78fc8 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From ddf401a1f1372c6addb6105a9fee1e92055a7946 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 26 Jan 2021 13:04:30 +0100 Subject: [PATCH 5/7] Update to upstream version 60 --- .gitignore | 1 + mojo-parent.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0887982..de97b98 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ mojo-parent-29-source-release.zip /mojo-parent-40-source-release.zip /mojo-parent-40.tar.gz /mojo-parent-50.tar.gz +/mojo-parent-60.tar.gz diff --git a/mojo-parent.spec b/mojo-parent.spec index aa58d5d..9aa56f9 100644 --- a/mojo-parent.spec +++ b/mojo-parent.spec @@ -1,5 +1,5 @@ Name: mojo-parent -Version: 50 +Version: 60 Release: 1%{?dist} Summary: Codehaus MOJO parent project pom file @@ -16,8 +16,6 @@ Codehaus MOJO parent project pom file %prep %setup -q -n %{name}-%{name}-%{version} -# Cobertura plugin is executed only during clean Maven phase. -%pom_remove_plugin :cobertura-maven-plugin # Not needed in Fedora. %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin @@ -36,6 +34,9 @@ cp %SOURCE1 . %doc LICENSE-2.0.txt %changelog +* Tue Jan 26 2021 Marian Koncek - 60-1 +- Update to upstream version 60 + * Wed Jul 29 2020 Marian Koncek - 50-1 - Update to upstream version 50 diff --git a/sources b/sources index f952169..d4c8ec0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mojo-parent-50.tar.gz) = 64b62629914776b7d139c5acee159f4a8d6dabc5885643f65724b7930fe6760e00d9dd92533806dea5deb2f187e0af0e5b6e356256944f0c8ad13dc2b5e78fc8 +SHA512 (mojo-parent-60.tar.gz) = 59216f3a5b20a5f0eac4ae1dd5e553e67ce88d35b9c7c14983911a8caf9b00018bdedb898ae8cd9865ed2c6ab485eb3a1204773c9a133c6b1bee0372ae8e9cb4 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 770fac3dde914978d9f0bdb7c49e8d0206d617bc 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 --- mojo-parent.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mojo-parent.spec b/mojo-parent.spec index 9aa56f9..a864c1f 100644 --- a/mojo-parent.spec +++ b/mojo-parent.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: mojo-parent Version: 60 Release: 1%{?dist} @@ -10,6 +12,9 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%endif %description Codehaus MOJO parent project pom file From f4357b37b510bf50307c4607429b83e7c124f15c 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 --- mojo-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mojo-parent.spec b/mojo-parent.spec index a864c1f..f62c6d5 100644 --- a/mojo-parent.spec +++ b/mojo-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: mojo-parent Version: 60