diff --git a/generate-tarball.sh b/generate-tarball.sh index 9e1f8b2..95953ce 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -9,13 +9,13 @@ wget "https://github.com/codehaus-plexus/plexus-languages/archive/plexus-languag rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp -tar xf "../${name}-${version}.orig.tar.gz" +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL find -name '*.jar' -delete find -name '*.class' -delete -tar caf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/plexus-languages.spec b/plexus-languages.spec index 16d31d4..c38acfc 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,10 +1,16 @@ -Name: plexus-languages -Summary: Plexus Languages -Version: 1.0.6 -Release: 2%{?dist} -License: ASL 2.0 +# 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-languages +Version: 1.0.6 +Release: 3%{?dist} +Summary: Plexus Languages +License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-languages +BuildArch: noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -12,15 +18,17 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Sources contain bundled jars that we cannot verify for licensing Source2: generate-tarball.sh -BuildArch: noarch - BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.ow2.asm:asm) +%endif %description Plexus Languages is a set of Plexus components that maintain shared @@ -28,30 +36,33 @@ language features. %{?javadoc_package} - %prep -%setup -q -n %{name}-%{name}-%{version} +%setup -q -n plexus-languages-plexus-languages-%{version} cp %{SOURCE1} . %pom_remove_plugin :maven-enforcer-plugin +# Remove module build specific to Java 9 +%pom_xpath_remove 'pom:profiles' plexus-java + %build # many tests rely on bundled test jars/classes %mvn_build -f - %install %mvn_install - %files -f .mfiles %license LICENSE-2.0.txt - %changelog -* Fri Apr 16 2021 Mohan Boddu - 1.0.6-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 1.0.6-3 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 1.0.6-2 +- Bootstrap build +- Non-bootstrap build * Sat Jan 30 2021 Fabio Valentini - 1.0.6-1 - Update to version 1.0.6. @@ -59,12 +70,18 @@ cp %{SOURCE1} . * Wed Jan 27 2021 Fedora Release Engineering - 1.0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Tue Jan 26 2021 Marian Koncek - 1.0.6-1 +- Update to upstream version 1.0.6 + * Mon Aug 10 2020 Mat Booth - 1.0.5-6 - Rebuild correctly as a proper JPMS module * Mon Aug 10 2020 Mat Booth - 1.0.5-5 - Bootstrap restoration of essential JPMS classes +* Wed Jul 29 2020 Marian Koncek - 1.0.5-1 +- Update to upstream version 1.0.5 + * Tue Jul 28 2020 Fedora Release Engineering - 1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -80,12 +97,18 @@ cp %{SOURCE1} . * Thu Jan 30 2020 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 0.9.10-5 +- Mass rebuild for javapackages-tools 201902 + * Fri Oct 11 2019 Fabio Valentini - 1.0.3-1 - Update to version 1.0.3. * Fri Jul 26 2019 Fedora Release Engineering - 0.9.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 0.9.10-4 +- Mass rebuild for javapackages-tools 201901 + * Sat Feb 02 2019 Fedora Release Engineering - 0.9.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -112,4 +135,3 @@ cp %{SOURCE1} . * Mon Sep 11 2017 Mikolaj Izdebski - 0.9.3-1 - Initial packaging - diff --git a/sources b/sources index bb3212b..93a30cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-languages-1.0.6.tar.gz) = 0f079c176effe58cc91f1ddf75dbd29963e312693a4285ddbee9c46666db41c0499fcc40743a7094835f914ee80df724e446bb49b200387235103a202f31dd78 +SHA512 (plexus-languages-1.0.6.tar.gz) = 273d47d3f0a93cbbf6c79c9c7463c05fa60bbde1aa6ca6914028d788048244c895c72c4d1fbe4b07a4626365e0dc6020bfece8d46f0bc2fb279ab66a70b19677 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8