From b92006228353c03bb4f3e05abcb08031255693ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 11:46:44 +0200 Subject: [PATCH 1/6] Update to upstream version 21 --- .gitignore | 1 + apache-parent.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75e0980..3e49c71 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /apache-17-source-release.zip /apache-18-source-release.zip /apache-19-source-release.zip +/apache-21-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index db4733e..17d434e 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent -Version: 19 -Release: 2%{?dist} +Version: 21 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 21-1 +- Update to upstream version 21 + * Wed Feb 07 2018 Fedora Release Engineering - 19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index b2aad7e..3118980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-19-source-release.zip) = 408e6fe646b3a6ac397bbd2540a9c188875e06ddd4113b0f15a6b0303fb850d368502fca0906dde4d1b69e6611145402f0a43715a8948ef6cdef6747cd3f24af +SHA512 (apache-21-source-release.zip) = ea5acf9123158c5140e69460eaa03f360651f597e3f5c908a0b9080f287024f1a54e75b8fe020f0b9847b7ae5be1fa3ee5d094e261bf060d90d568ccd0bc8a53 From adaf7a0917d1f3b2007d423b332e3fb637cfd28c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:21 +0200 Subject: [PATCH 2/6] Mass rebuild for javapackages-tools 201901 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 17d434e..992424d 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 21-2 +- Mass rebuild for javapackages-tools 201901 + * Tue May 14 2019 Mikolaj Izdebski - 21-1 - Update to upstream version 21 From c38fb68eab765deaa5635b3b9f1f53c4e68873ff Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 3/6] Mass rebuild for javapackages-tools 201902 --- apache-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 992424d..26f1def 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,6 +1,6 @@ Name: apache-parent Version: 21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 21-2 - Mass rebuild for javapackages-tools 201901 From 596441bbfeb1f6f21100496111359db5d7135e0b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jan 2020 16:19:00 +0100 Subject: [PATCH 4/6] Update to upstream version 23 --- .gitignore | 1 + apache-parent.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e49c71..9190030 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /apache-18-source-release.zip /apache-19-source-release.zip /apache-21-source-release.zip +/apache-23-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index 26f1def..b7ecc41 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,10 +1,10 @@ Name: apache-parent -Version: 21 -Release: 3%{?dist} +Version: 23 +Release: 1%{?dist} Summary: Parent POM file for Apache projects License: ASL 2.0 URL: http://apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local @@ -33,6 +33,9 @@ This package contains the parent pom file for apache projects. %doc LICENSE NOTICE %changelog +* Wed Jan 29 2020 Marian Koncek - 23-1 +- Update to upstream version 23 + * Tue Nov 05 2019 Mikolaj Izdebski - 21-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 3118980..4e38ae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-21-source-release.zip) = ea5acf9123158c5140e69460eaa03f360651f597e3f5c908a0b9080f287024f1a54e75b8fe020f0b9847b7ae5be1fa3ee5d094e261bf060d90d568ccd0bc8a53 +SHA512 (apache-23-source-release.zip) = a72b94255c5cef7cb53700cfc53287d05361e4d73f0fcf71930c329aeb467787bcc3f7911793839a14a71d372c44e36438c2a4e66e811cead042a799b11587c1 From 9ed7aeb2de1a38ea2f585c43049eaceec73c9f7c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 5/6] Conditionalize buildrequires in bootstrap mode --- apache-parent.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apache-parent.spec b/apache-parent.spec index b7ecc41..9814165 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-parent Version: 23 Release: 1%{?dist} @@ -8,11 +10,17 @@ Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apac BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +%endif # Not generated automatically +%if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif Requires: mvn(org.apache:apache-jar-resource-bundle) %description From 16ef6b1bcf27b7f353b4ea02d52602d9f61f336e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 6/6] Turn off bootstrap mode by default --- apache-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-parent.spec b/apache-parent.spec index 9814165..71aebd9 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-parent Version: 23