diff --git a/msv.spec b/msv.spec index b06ea8e..ff1ec35 100644 --- a/msv.spec +++ b/msv.spec @@ -24,12 +24,14 @@ Source1: generate-tarball.sh Patch: 0001-Disable-Apache-XercesImpl.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2022.7-15 %description The Multi Schema Validation toolkit is a Java based toolkit consisting of 8 @@ -38,12 +40,6 @@ for the validation of XML documents against several kinds of XML schemata The core supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs, and a subset of XML Schema Part 1. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 @@ -72,14 +68,11 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %mvn_package net.java.dev.msv:msv __noinstall %build -%mvn_build -s +%mvn_build -j -s %install %mvn_install -%files javadoc -f .mfiles-javadoc -%license Apache-LICENSE-1.1.txt license.txt - %files xsdlib -f .mfiles-xsdlib %doc README.md README-xsdlib.md %license Apache-LICENSE-1.1.txt license.txt diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: f42 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 execute: how: tmt