From b2df7b6d395bebb9b6c29f101465fcd5d9e73984 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 8 Jun 2021 20:17:56 +0200 Subject: [PATCH] Bootstrap Maven as non-modular packages Resolves: rhbz#1951482 --- .gitignore | 1 + felix-parent.spec | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 641a0a3..5a1af70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ felix-parent-1.2.1.tar.bz2 /felix-parent-2.1-source-release.tar.gz /felix-parent-4-source-release.tar.gz +/felix-parent-6-source-release.tar.gz /felix-parent-7-source-release.tar.gz diff --git a/felix-parent.spec b/felix-parent.spec index dc961e8..e766021 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,18 +1,24 @@ +# Workaround for rhbz#1969370: __bootstrap macro is not defined in +# CentOS Stream, See https://bugzilla.redhat.com/1969370 +%global __bootstrap ~bootstrap + +%bcond_without bootstrap + Name: felix-parent Version: 7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parent POM file for Apache Felix Specs License: ASL 2.0 URL: https://felix.apache.org/ -Source0: https://repo1.maven.org/maven2/org/apache/felix/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz +Source0: https://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache:apache:pom:) - -# FIXME auto-requires are not generated -Requires: mvn(org.easymock:easymock) -Requires: mvn(org.mockito:mockito-all) +%endif %description Parent POM file for Apache Felix Specs. @@ -41,12 +47,19 @@ Parent POM file for Apache Felix Specs. %doc LICENSE NOTICE %changelog -* Thu Apr 15 2021 Mohan Boddu - 7-5 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 7-6 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 7-5 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Wed Jul 29 2020 Marian Koncek - 7-1 +- Update to upstream version 7 + * Mon Jul 27 2020 Fedora Release Engineering - 7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -59,9 +72,18 @@ Parent POM file for Apache Felix Specs. * Tue Jan 28 2020 Fedora Release Engineering - 4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 6-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Thu Jul 18 2019 Marian Koncek - 6-1 +- Update to upstream version 6 + +* Fri May 24 2019 Mikolaj Izdebski - 4-6 +- Mass rebuild for javapackages-tools 201901 + * Thu Jan 31 2019 Fedora Release Engineering - 4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild