From 1b9818665288194aa5a7cba6956b554ab593a331 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 --- munge-maven-plugin.spec | 30 ++++++++++++++++++++++++------ sources | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/munge-maven-plugin.spec b/munge-maven-plugin.spec index bff5eee..d7da7e6 100644 --- a/munge-maven-plugin.spec +++ b/munge-maven-plugin.spec @@ -1,6 +1,12 @@ +# 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: munge-maven-plugin Version: 1.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Munge Maven Plugin License: CDDL-1.0 URL: http://github.com/sonatype/munge-maven-plugin @@ -9,10 +15,15 @@ BuildArch: noarch Source0: https://github.com/sonatype/munge-maven-plugin/archive/munge-maven-plugin-1.0.tar.gz BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +%endif %description Munge is a purposely-simple Java preprocessor. It only supports @@ -43,8 +54,6 @@ This package provides %{summary}. %prep %setup -q -n %{name}-%{name}-%{version} - -# remove unnecessary dependency on parent POM %pom_remove_parent %build @@ -54,7 +63,6 @@ This package provides %{summary}. %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %license LICENSE %doc README @@ -62,8 +70,12 @@ This package provides %{summary}. %license LICENSE %changelog -* Fri Apr 16 2021 Mohan Boddu - 1.0-20 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 1.0-21 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 1.0-20 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -80,9 +92,15 @@ This package provides %{summary}. * Sun Nov 17 2019 Fabio Valentini - 1.0-15 - Remove unnecessary dependency on parent POM. +* Tue Nov 05 2019 Mikolaj Izdebski - 1.0-13 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 1.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 1.0-12 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 1.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 5bf3669..f0b4113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a8271622897569b6a23592f520469c2 munge-maven-plugin-1.0.tar.gz +SHA512 (munge-maven-plugin-1.0.tar.gz) = 4c688861b708c55064053add7a10699acd2a4f8f0a89250c587085260d92076e7b86527a66726d6784391ea1c55d3c7d2d9e7769ad533675494fda795627ec9a