From d434f529b8bb1f9e849fed15b6899a2aa46d0d18 Mon Sep 17 00:00:00 2001 From: Jacek Migacz Date: Mon, 9 Mar 2026 15:10:29 +0000 Subject: [PATCH] Update to upstream version 1.12 --- .gitignore | 1 + sources | 2 +- xz-java.spec | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aedbbd8..a2e8691 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xz-java-1.7.zip /xz-java-1.8.zip /xz-java-1.9.zip +/xz-java-1.12.zip diff --git a/sources b/sources index 535d643..83cfb86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xz-java-1.9.zip) = 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb +SHA512 (xz-java-1.12.zip) = ea6b6fa8b7021a3e8caa9b750156078182fcde1c4c9926740fea51827facba8227d3d2fe6c95de7a4e9ce9cda531f4706d9a582a04155ac2eaac36c5f51c8bf7 diff --git a/xz-java.spec b/xz-java.spec index 18def98..c951bf0 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: xz-java -Version: 1.9 +Version: 1.12 Release: %autorelease Summary: Java implementation of XZ data compression License: LicenseRef-Fedora-Public-Domain @@ -31,6 +31,19 @@ for advanced users, including LZMA2 with preset dictionary. %prep %autosetup -p1 -C +# Strip modern Ant namespace attributes for bootstrap compatibility. +# javapackages-bootstrap uses an older Ant that doesn't support ant:if/ant:unless. +# TODO Drop after javapackages-bootstrap > 1.27 is released +sed -i 's/xmlns:if="ant:if"//g' build.xml +sed -i 's/xmlns:unless="ant:unless"//g' build.xml +sed -i 's/\sif:true="[^"]*"//g' build.xml +sed -i 's/\sunless:true="[^"]*"//g' build.xml +sed -i 's/\sif:set="[^"]*"//g' build.xml +sed -i 's/\sunless:set="[^"]*"//g' build.xml +sed -i 's/\smodificationtime="[^"]*"//g' build.xml +sed -i 's/if:true="[^"]*"//g' build.xml +sed -i 's/unless:true="[^"]*"//g' build.xml + %mvn_file : %{name} xz %build @@ -38,7 +51,7 @@ 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 maven +%ant -Dsourcever=8 -Dsourcever9=9 maven %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar @@ -46,7 +59,7 @@ mkdir -p extdoc && touch extdoc/package-list %mvn_install %files -f .mfiles -%doc README THANKS +%doc README.md THANKS.md %license COPYING %changelog