From 9713b852f84432b76e7b7b7b86d41a3c44300d2c 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 --- plexus-io.spec | 61 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/plexus-io.spec b/plexus-io.spec index 5b3054c..675b9cc 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -1,21 +1,32 @@ +# 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: plexus-io -Summary: Plexus IO Components Version: 3.2.0 -Release: 6%{?dist} +Release: 7%{?dist} +Summary: Plexus IO Components License: ASL 2.0 - -URL: https://github.com/codehaus-plexus/%{name} -Source0: %{url}/archive/%{name}-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt - +URL: https://github.com/codehaus-plexus/plexus-io BuildArch: noarch -BuildRequires: maven-local +Source0: https://github.com/codehaus-plexus/plexus-io/archive/plexus-io-%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0 +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description Plexus IO is a set of plexus components, which are designed for use @@ -27,38 +38,35 @@ Summary: Javadoc for %{name} %description javadoc API documentation for %{name}. - %prep %setup -q -n plexus-io-plexus-io-%{version} - cp %{SOURCE1} . %pom_remove_plugin :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-enforcer-plugin - -# junit isn't actually used -%pom_remove_dep :junit +# Test fails in mock +sed -i /class/i@org.junit.Ignore src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java %build %mvn_file : plexus/io %mvn_build - %install %mvn_install - %files -f .mfiles %license NOTICE.txt LICENSE-2.0.txt %files javadoc -f .mfiles-javadoc %license NOTICE.txt LICENSE-2.0.txt - %changelog -* Fri Apr 16 2021 Mohan Boddu - 3.2.0-6 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.2.0-7 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 3.2.0-6 +- Bootstrap build +- Non-bootstrap build * Wed Jan 27 2021 Fedora Release Engineering - 3.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -72,6 +80,12 @@ cp %{SOURCE1} . * Thu Jan 30 2020 Fedora Release Engineering - 3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.2.0-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Oct 23 2019 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + * Wed Oct 16 2019 Fabio Valentini - 3.2.0-1 - Update to version 3.2.0. @@ -81,6 +95,12 @@ cp %{SOURCE1} . * Fri Jul 26 2019 Fedora Release Engineering - 3.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 3.1.1-2 +- Mass rebuild for javapackages-tools 201901 + +* Mon May 13 2019 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 + * Sat Feb 02 2019 Fedora Release Engineering - 3.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -219,4 +239,3 @@ cp %{SOURCE1} . * Wed Dec 23 2009 Alexander Kurtakov 1.0-0.1.a5.1 - Initial package -