Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openmarkup for openSUSE:Factory
checked in at 2025-02-05 12:41:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openmarkup (Old)
and /work/SRC/openSUSE:Factory/.openmarkup.new.2316 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmarkup"
Wed Feb 5 12:41:51 2025 rev:17 rq:1243245 version:1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/openmarkup/openmarkup.changes 2024-09-30
15:40:27.009144247 +0200
+++ /work/SRC/openSUSE:Factory/.openmarkup.new.2316/openmarkup.changes
2025-02-05 12:42:21.029316236 +0100
@@ -1,0 +2,7 @@
+Wed Feb 5 06:29:06 UTC 2025 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * openmarkup-1.1-nojavaws.patch
+ + remove reference to unused javaws.jar in the build.xml
+
+-------------------------------------------------------------------
New:
----
openmarkup-1.1-nojavaws.patch
BETA DEBUG BEGIN:
New:- Added patch:
* openmarkup-1.1-nojavaws.patch
+ remove reference to unused javaws.jar in the build.xml
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openmarkup.spec ++++++
--- /var/tmp/diff_new_pack.pmdLTr/_old 2025-02-05 12:42:21.613340341 +0100
+++ /var/tmp/diff_new_pack.pmdLTr/_new 2025-02-05 12:42:21.617340506 +0100
@@ -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 @@
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 @@
# 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=%{_jvmdir}/java/bin \
+ -f make/build.xml \
-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
%install
++++++ openmarkup-1.1-nojavaws.patch ++++++
--- 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">
