Accepting request 1204561 from Java:packages

Fix build after removal of the default %%{java_home} define

OBS-URL: https://build.opensuse.org/request/show/1204561
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=26

apache-ivy.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep 29 19:45:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build after removal of the default %%{java_home} define
+
 -------------------------------------------------------------------
 Tue Feb 20 10:44:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

apache-ivy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -47,7 +47,9 @@ BuildArch:      noarch
 %if %{with pack200}
 BuildRequires:  pack200
 %else
+BuildConflicts: java >= 14
 BuildConflicts: java-devel >= 14
+BuildConflicts: java-headless >= 14
 %endif
 %if %{with vfs}
 BuildRequires:  apache-commons-vfs2