From 5d814889b09aecf12fb7b1d7a0fd5f95a3c05fa9 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 --- maven-shared-io.spec | 27 +++++++++++++++++++++++---- sources | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/maven-shared-io.spec b/maven-shared-io.spec index fc8134b..cc07a72 100644 --- a/maven-shared-io.spec +++ b/maven-shared-io.spec @@ -1,7 +1,13 @@ +# 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: maven-shared-io Epoch: 1 Version: 3.0.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: API for I/O support like logging, download or file scanning License: ASL 2.0 URL: http://maven.apache.org/shared/maven-shared-io @@ -13,6 +19,9 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{ Patch0: 0001-Fix-running-tests-with-Maven-3.3.9.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) @@ -22,6 +31,7 @@ BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.easymock:easymock) +%endif %description API for I/O support like logging, download or file scanning. @@ -49,8 +59,12 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog -* Fri Apr 16 2021 Mohan Boddu - 1:3.0.0-13 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 1:3.0.0-14 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 1:3.0.0-13 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1:3.0.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -64,9 +78,15 @@ API documentation for %{name}. * Wed Jan 29 2020 Fedora Release Engineering - 1:3.0.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 1:3.0.0-7 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 1:3.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 1:3.0.0-6 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 1:3.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -128,4 +148,3 @@ API documentation for %{name}. * Tue Jan 15 2013 Tomas Radej - 1:1.1-1 - Initial version - diff --git a/sources b/sources index 5d13a92..fd5ea07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65e661c0bf619e13a79a0e1a3ff19a8f maven-shared-io-3.0.0-source-release.zip +SHA512 (maven-shared-io-3.0.0-source-release.zip) = de87f14d4a7639dd2ce228d5a6d2a7f3f1735b0bf41b09f8f3041eed7e801dec28f48d9459d22cb1c3b70bc363b31f012625d73ba095eeaa758101d68bb4010a