From c1d5788b5339a6c6439f173e7a35f24cf1cbdf9a Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Mon, 31 Aug 2026 11:04:27 +0800 Subject: [PATCH] fix(xz-java): Update xz-java spec for improved automation and dependencies The spec file has been updated to include automated release number generation, adjust the URL and license field, update build requirements, and remove the javadoc package. The changes aim to streamline the build process and align with current standards. Assisted-by: qwen:qwen3.7-max --- xz-java.spec | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/xz-java.spec b/xz-java.spec index 270b40c..91ab552 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,21 +1,23 @@ -%define anolis_release 1 - -# Macros from upstream reference spec +## START: Set by rpmautospec +## (rpmautospec version 0.8.3) +## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: release_number = 31; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} - +## END: Set by rpmautospec %bcond_with bootstrap Name: xz-java +%define anolis_release 1 + Version: 1.12 Release: %{anolis_release}%{?dist} Summary: Java implementation of XZ data compression -License: Public Domain -URL: http://tukaani.org/xz/java.html +License: LicenseRef-Fedora-Public-Domain +URL: https://tukaani.org/xz/java.html BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -24,10 +26,12 @@ 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 Anolis 46 +Obsoletes: %{name}-javadoc < 1.9-25 %description A complete implementation of XZ data compression in Java. @@ -37,14 +41,8 @@ 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: Javadocs for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - %prep -%autosetup -p1 -C +%setup -q -c %{name}-%{version} %mvn_file : %{name} xz @@ -58,11 +56,12 @@ mkdir -p extdoc && touch extdoc/package-list %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar -%mvn_install +%mvn_install -J build/doc %files -f .mfiles -%doc README THANKS +%doc README.md THANKS.md %license COPYING +%{_javadocdir}/%{name}/ %changelog * Mon Aug 31 2026 PengLAI Code - 1.12-1 -- Gitee