Remove build-dependency on asciidoc
This commit is contained in:
parent
380332c291
commit
d0736dabf0
17
junit5.spec
17
junit5.spec
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
Name: junit5
|
Name: junit5
|
||||||
Version: 5.10.2
|
Version: 5.10.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Java regression testing framework
|
Summary: Java regression testing framework
|
||||||
License: EPL-2.0
|
License: EPL-2.0
|
||||||
URL: https://junit.org/junit5/
|
URL: https://junit.org/junit5/
|
||||||
@ -39,10 +39,9 @@ Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-e
|
|||||||
# BOM POM
|
# BOM POM
|
||||||
Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom
|
Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom
|
||||||
|
|
||||||
Patch1: 0001-Drop-transitive-requirement-on-apiguardian.patch
|
Patch: 0001-Drop-transitive-requirement-on-apiguardian.patch
|
||||||
Patch2: 0002-Add-missing-module-static-requires.patch
|
Patch: 0002-Add-missing-module-static-requires.patch
|
||||||
|
|
||||||
BuildRequires: asciidoc
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap}
|
||||||
BuildRequires: javapackages-bootstrap
|
BuildRequires: javapackages-bootstrap
|
||||||
%else
|
%else
|
||||||
@ -72,11 +71,9 @@ Requires: %{name}-javadoc = %{version}-%{release}
|
|||||||
JUnit 5 User Guide.
|
JUnit 5 User Guide.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-r%{version}
|
%autosetup -p1 -n %{name}-r%{version}
|
||||||
find -name '*.jar' -delete
|
find -name '*.jar' -delete
|
||||||
|
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
cp -p %{SOURCE100} pom.xml
|
cp -p %{SOURCE100} pom.xml
|
||||||
|
|
||||||
@ -113,9 +110,6 @@ done
|
|||||||
%build
|
%build
|
||||||
%mvn_build -f
|
%mvn_build -f
|
||||||
|
|
||||||
# Build docs. Ignore exit asciidoc -- it fails for some reason, but
|
|
||||||
# still produces readable docs.
|
|
||||||
asciidoc documentation/src/docs/asciidoc/index.adoc || :
|
|
||||||
ln -s ../../javadoc/junit5 documentation/src/docs/api
|
ln -s ../../javadoc/junit5 documentation/src/docs/api
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -131,6 +125,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
|
|||||||
%doc documentation/src/docs/*
|
%doc documentation/src/docs/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 16 2025 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.10.2-5
|
||||||
|
- Remove build-dependency on asciidoc
|
||||||
|
|
||||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.10.2-4
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.10.2-4
|
||||||
- Bump release for October 2024 mass rebuild:
|
- Bump release for October 2024 mass rebuild:
|
||||||
Resolves: RHEL-64018
|
Resolves: RHEL-64018
|
||||||
|
Loading…
Reference in New Issue
Block a user