changelog

@@ -1,12 +0,0 @@
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Aug 07 2023 Marian Koncek <mkoncek@redhat.com> - 2022.7-1
-- Package unretired
-- Update to upstream version 2022.7

msv.spec

@@ -1,6 +1,6 @@
 Name:           msv
 Version:        2022.7
-Release:        %autorelease
+Release:        4%{?dist}
 Summary:        Multi-Schema Validator Toolkit
 # License breakdown
 # Apache-1.1
@@ -20,18 +20,17 @@ ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
+
 Source1:        generate-tarball.sh
 
-Patch:          0001-Disable-Apache-XercesImpl.patch
+Patch1:         0001-Disable-Apache-XercesImpl.patch
 
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
 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
@@ -40,17 +39,24 @@ 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 xsdlib
+%package        javadoc
+Summary:        API documentation for %{name}
+
+%description    javadoc
+This package provides %{summary}.
+
+%package        xsdlib
 Summary:        Java implementation of W3C’s XML Schema Part 2
 
-%description xsdlib
+%description    xsdlib
 MSV XML Datatypes Library, Java implementation of W3C’s XML Schema Part 2, is
 intended for use with applications that incorporate XML Schema Part 2.
 
 %prep
-%autosetup -p1 -C
+%setup -q
 
 # Disable runtime dependency on Apache Xerces
+%patch 1 -p1
 rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
 
 %pom_xpath_remove 'pom:project/pom:modules'
@@ -68,14 +74,28 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
 %mvn_package net.java.dev.msv:msv __noinstall
 
 %build
-%mvn_build -j -s
+%mvn_build -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
 
 %changelog
-%autochangelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Aug 07 2023 Marian Koncek <mkoncek@redhat.com> - 2022.7-1
+- Package unretired
+- Update to upstream version 2022.7

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f41
 execute:
   how: tmt