Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482
This commit is contained in:
Mikolaj Izdebski 2021-06-08 20:17:56 +02:00
parent 2058ccaa50
commit 2990a51104
2 changed files with 30 additions and 13 deletions

View File

@ -1,3 +1,9 @@
# Workaround for rhbz#1969370: __bootstrap macro is not defined in
# CentOS Stream, See https://bugzilla.redhat.com/1969370
%global __bootstrap ~bootstrap
%bcond_without bootstrap
# Copyright (c) 2000-2012, JPackage Project
# All rights reserved.
#
@ -30,8 +36,7 @@
Name: jdom
Version: 1.1.3
Release: 25%{?dist}
Epoch: 0
Release: 26%{?dist}
Summary: Java alternative to DOM and SAX
License: Saxpath
URL: http://www.jdom.org/
@ -40,11 +45,12 @@ Source1: http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{ve
Patch0: %{name}-crosslink.patch
Patch1: %{name}-1.1-OSGiManifest.patch
BuildRequires: ant
BuildRequires: javapackages-local
BuildRequires: mvn(jaxen:jaxen)
BuildRequires: mvn(xerces:xercesImpl)
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: ant
%endif
BuildArch: noarch
@ -64,7 +70,7 @@ Javadoc for %{name}.
%package demo
Summary: Demos for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description demo
Demonstrations and samples for %{name}.
@ -77,11 +83,9 @@ Demonstrations and samples for %{name}.
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
find . -name "*.class" -exec rm -f {} \;
sed -i -e "s|1.2|1.6|" build.xml
%build
export CLASSPATH=$(build-classpath xerces-j2 jaxen)
ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
%ant -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
%install
%mvn_file : %{name}
@ -105,8 +109,15 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
%license LICENSE.txt
%changelog
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.1.3-25
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-26
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-25
- Bump release
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-20
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -123,9 +134,15 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-19
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-18
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.1.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
dc8391e84cfdb170fcd8279aa370019f jdom-1.1.3.tar.gz
SHA512 (jdom-1.1.3.tar.gz) = a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278