Accepting request 1243245 from Java:packages

fix build

OBS-URL: https://build.opensuse.org/request/show/1243245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openmarkup?expand=0&rev=17

openmarkup-1.1-nojavaws.patch

@@ -0,0 +1,29 @@
+--- openmarkup-1.1/make/build.xml	2025-02-05 07:26:04.109248388 +0100
++++ openmarkup-1.1/make/build.xml	2025-02-05 07:26:46.361680537 +0100
+@@ -37,18 +37,6 @@
+ 	<!-- docs directory -->
+ 	<property name="docs.dir" location="docs"/>
+ 	<property name="javadoc.dir" location="${docs.dir}/javadoc"/>
+-	<!-- java web start -->
+-	<condition property="javaws.dir" value="${java.home}/lib/">
+-		<equals arg1="${java.specification.version}" arg2="1.5"/>
+-	</condition>
+-	<condition property="javaws.dir" value="/Applications/Utilities/Java/Java\ Web\ Start.app/Contents/MacOS/">
+-		<os family="mac"/>
+-	</condition>
+-	<condition property="javaws.dir" value="${java.home}/javaws/">
+-		<not>
+-			<isset property="javaws.dir"/>
+-		</not>
+-	</condition>
+ 	<!-- test directory -->
+ 	<property name="test.dir" location="${build.dir}/test"/>
+ 	<property name="test.classes.dir" location="${test.dir}/classes"/>
+@@ -61,7 +49,6 @@
+ 	<!-- Paths                                                        -->
+ 	<!-- ============================================================ -->
+ 	<path id="compile.classpath">
+-		<fileset dir="${javaws.dir}" includes="**/javaws*.jar"/>
+ 		<fileset dir="${lib.dir}" includes="**/*.jar"/>
+ 	</path>
+ 	<path id="test.classpath">

openmarkup.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb  5 06:29:06 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * openmarkup-1.1-nojavaws.patch
+    + remove reference to unused javaws.jar in the build.xml
+
+-------------------------------------------------------------------
+Sun Sep 29 19:49:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build after removal of the default %%{java_home} define
+
 -------------------------------------------------------------------
 Wed Feb 21 21:05:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

openmarkup.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package openmarkup
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,7 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        AsyncClients.pdf
 Source2:        XMLContentHandlers.pdf
 Patch0:         openmarkup-1.1-nosource.patch
+Patch1:         openmarkup-1.1-nojavaws.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
@@ -83,10 +84,11 @@ cp %{SOURCE1} %{SOURCE2} .
 # wrong end of line encoding
 sed -i -e 's/.$//' doc/javadoc/stylesheet.css doc/javadoc/package-list Copyright.txt LICENSE.txt
 %patch -P 0 -p1
+%patch -P 1 -p1
 
 %build
 ant \
-    -f make/build.xml -Djavaws.dir=%{java_home}/bin \
+    -f make/build.xml \
     -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
 
 %install