From 4ee237ca42a893376ce814a647cd29cd8a68027b607c78f126d71d27432e8f82 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 19 Feb 2024 12:53:32 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=91 --- xmvn-tools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xmvn-tools.spec b/xmvn-tools.spec index 5e7b703..d45e19b 100644 --- a/xmvn-tools.spec +++ b/xmvn-tools.spec @@ -31,6 +31,7 @@ Patch0: UUID.patch Patch1: 0001-Do-not-leave-a-stray-options-file-in-the-generated-j.patch BuildRequires: ant BuildRequires: apache-commons-compress +BuildRequires: apache-commons-io BuildRequires: atinject BuildRequires: beust-jcommander >= 1.82 BuildRequires: fdupes @@ -106,6 +107,7 @@ Group: Development/Tools/Building Requires: %{parent}-api = %{version} Requires: %{parent}-core = %{version} Requires: apache-commons-compress +Requires: apache-commons-io Requires: beust-jcommander Requires: javapackages-tools Requires: objectweb-asm @@ -214,7 +216,7 @@ done %fdupes -s %{buildroot}%{_javadocdir} # helper scripts -%jpackage_script org.fedoraproject.xmvn.tools.install.cli.InstallerCli "" "" %{parent}/%{parent}-install:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander:slf4j/api:slf4j/simple:objectweb-asm/asm:commons-compress %{parent}-install +%jpackage_script org.fedoraproject.xmvn.tools.install.cli.InstallerCli "" "" %{parent}/%{parent}-install:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander:slf4j/api:slf4j/simple:objectweb-asm/asm:commons-compress:commons-io %{parent}-install %jpackage_script org.fedoraproject.xmvn.tools.resolve.ResolverCli "" "" %{parent}/%{parent}-resolve:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander %{parent}-resolve %jpackage_script org.fedoraproject.xmvn.tools.subst.SubstCli "" "" %{parent}/%{parent}-subst:%{parent}/%{parent}-api:%{parent}/%{parent}-core:beust-jcommander %{parent}-subst From ad9f13e1d749ccb53b8921f13d5232bd6a0d8c1af719acf58c859bf963fd418a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 19 Feb 2024 13:11:51 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmvn?expand=0&rev=92 --- xmvn-tools.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xmvn-tools.changes b/xmvn-tools.changes index e2691e7..0af9dbd 100644 --- a/xmvn-tools.changes +++ b/xmvn-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 19 13:09:53 UTC 2024 - Fridrich Strba + +- Modify the xmvn-install script to work with new + apache-commons-compress + ------------------------------------------------------------------- Tue Jan 30 09:25:00 UTC 2024 - Fridrich Strba