Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package freemarker for openSUSE:Factory
checked in at 2023-07-01 23:18:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freemarker (Old)
and /work/SRC/openSUSE:Factory/.freemarker.new.13546 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freemarker"
Sat Jul 1 23:18:06 2023 rev:5 rq:1095811 version:2.3.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/freemarker/freemarker.changes 2022-05-10
15:11:54.931568914 +0200
+++ /work/SRC/openSUSE:Factory/.freemarker.new.13546/freemarker.changes
2023-07-01 23:18:12.794318565 +0200
@@ -1,0 +2,8 @@
+Tue Jun 27 16:27:43 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * jython-compatibility.patch
+ + the new jython is not backward compatible to 2.2, so build
+ only jython 2.5 support
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freemarker.spec ++++++
--- /var/tmp/diff_new_pack.hP94dK/_old 2023-07-01 23:18:13.462322570 +0200
+++ /var/tmp/diff_new_pack.hP94dK/_new 2023-07-01 23:18:13.466322593 +0200
@@ -1,7 +1,7 @@
#
# spec file for package freemarker
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -96,7 +96,7 @@
# Correct classpath for Javadoc generation
sed -i 's/cachepath conf="IDE"/cachepath conf="javadoc"/' build.xml
-sed -i '/conf name="IDE"/i<conf name="javadoc"
extends="build.jython2.2,build.jsp2.1" />' ivy.xml
+sed -i '/conf name="IDE"/i<conf name="javadoc"
extends="build.jython2.5,build.jsp2.1" />' ivy.xml
# Drop unnecessary dep on avalon
sed -i -e '/avalon-logkit/d' ivy.xml
++++++ jython-compatibility.patch ++++++
--- /var/tmp/diff_new_pack.hP94dK/_old 2023-07-01 23:18:13.506322833 +0200
+++ /var/tmp/diff_new_pack.hP94dK/_new 2023-07-01 23:18:13.510322857 +0200
@@ -1,24 +1,20 @@
-Index: freemarker-2.3.31/build.xml
-===================================================================
---- freemarker-2.3.31.orig/build.xml
-+++ freemarker-2.3.31/build.xml
-@@ -302,38 +302,18 @@
+--- freemarker-2.3.31/build.xml 2023-06-27 18:19:23.363930276 +0200
++++ freemarker-2.3.31/build.xml 2023-06-27 18:20:14.936293089 +0200
+@@ -303,31 +303,6 @@
freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
/>
- <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
-+ <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" />
- <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
- includeantruntime="false"
+- <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
+- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
+- includeantruntime="false"
- classpathref="ivy.dep.jython2.0"
-+ classpathref="ivy.dep.jython2.2"
- bootclasspath="${boot.classpath.j2se1.7}"
- includes="
- freemarker/ext/ant/**,
- freemarker/template/utility/JythonRuntime.java,
- freemarker/ext/jython/**"
- excludes="
+- bootclasspath="${boot.classpath.j2se1.7}"
+- includes="
+- freemarker/ext/ant/**,
+- freemarker/template/utility/JythonRuntime.java,
+- freemarker/ext/jython/**"
+- excludes="
- freemarker/ext/jython/_Jython22VersionAdapter.java,
- freemarker/ext/jython/_Jython25VersionAdapter.java"
- />
@@ -33,15 +29,7 @@
- freemarker/ext/jython/_Jython22VersionAdapter.java"
- />
-
-- <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
-- <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
-- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
-- includeantruntime="false"
-- classpathref="ivy.dep.jython2.5"
-- bootclasspath="${boot.classpath.j2se1.7}"
-- includes="
-+ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
- freemarker/ext/jython/_Jython25VersionAdapter.java"
- />
-
+ <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
+ <javac srcdir="build/src-main-java-filtered" destdir="build/classes"
deprecation="off"
+ debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
