diff --git a/.gitignore b/.gitignore index a2e8691..aedbbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,3 @@ /xz-java-1.7.zip /xz-java-1.8.zip /xz-java-1.9.zip -/xz-java-1.12.zip diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index ae17c0c..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 + ref: f42 execute: how: tmt diff --git a/sources b/sources index 83cfb86..535d643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xz-java-1.12.zip) = ea6b6fa8b7021a3e8caa9b750156078182fcde1c4c9926740fea51827facba8227d3d2fe6c95de7a4e9ce9cda531f4706d9a582a04155ac2eaac36c5f51c8bf7 +SHA512 (xz-java-1.9.zip) = 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb diff --git a/xz-java.spec b/xz-java.spec index cba9d4b..e2dde50 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: xz-java -Version: 1.12 +Version: 1.9 Release: %autorelease Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain @@ -14,11 +14,9 @@ Source0: https://tukaani.org/xz/xz-java-%{version}.zip %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant-openjdk25 +BuildRequires: javapackages-local +BuildRequires: ant %endif -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 1.9-25 %description A complete implementation of XZ data compression in Java. @@ -28,6 +26,12 @@ single-threaded streamed compression and decompression, single-threaded decompression with limited random access support, raw streams (no .xz headers) for advanced users, including LZMA2 with preset dictionary. +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. + %prep %autosetup -p1 -C @@ -38,15 +42,18 @@ for advanced users, including LZMA2 with preset dictionary. # package-list from oracle.com. Create a dummy package-list to prevent that. mkdir -p extdoc && touch extdoc/package-list -%ant -Dsourcever=8 -Dsourcever9=9 maven +%ant -Dsourcever=8 maven %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar -%mvn_install +%mvn_install -J build/doc %files -f .mfiles -%doc README.md THANKS.md +%doc README THANKS +%license COPYING + +%files javadoc -f .mfiles-javadoc %license COPYING %changelog