Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package freemarker for openSUSE:Factory checked in at 2022-02-11 23:07:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freemarker (Old) and /work/SRC/openSUSE:Factory/.freemarker.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freemarker" Fri Feb 11 23:07:26 2022 rev:3 rq:953270 version:2.3.31 Changes: -------- --- /work/SRC/openSUSE:Factory/freemarker/freemarker.changes 2020-01-27 20:16:43.948496695 +0100 +++ /work/SRC/openSUSE:Factory/.freemarker.new.1956/freemarker.changes 2022-02-11 23:08:51.478850259 +0100 @@ -1,0 +2,15 @@ +Thu Feb 10 07:38:04 UTC 2022 - Anton Shvetz <[email protected]> + +- Update to v2.3.31 +- Update patches: + * enable-jdom.patch + * javacc-7.patch + * jsp-api.patch + * jython-compatibility.patch + * no-javarebel.patch +- Remove unneeded patch: + * fix-javadoc-encoding.patch +- Package the manual. Add build dependency on + docbook5-xsl-stylesheets + +------------------------------------------------------------------- Old: ---- fix-javadoc-encoding.patch freemarker-2.3.28.tar.gz New: ---- freemarker-2.3.31.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freemarker.spec ++++++ --- /var/tmp/diff_new_pack.WA59mk/_old 2022-02-11 23:08:52.150852203 +0100 +++ /var/tmp/diff_new_pack.WA59mk/_new 2022-02-11 23:08:52.154852215 +0100 @@ -1,7 +1,7 @@ # # spec file for package freemarker # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with jp_minimal Name: freemarker -Version: 2.3.28 +Version: 2.3.31 Release: 0 Summary: The Apache FreeMarker Template Engine License: Apache-2.0 @@ -29,18 +29,17 @@ Patch1: jsp-api.patch # Compile only the classes compatible with the version of jython that we have Patch2: jython-compatibility.patch -# illegal character in the javadoc comment -Patch3: fix-javadoc-encoding.patch # Disable JRebel integration, it is not free software and not available in openSUSE -Patch5: no-javarebel.patch -# enable jdom extension -Patch6: enable-jdom.patch +Patch3: no-javarebel.patch +# Enable jdom extension +Patch4: enable-jdom.patch # Fix compatibility with javacc 7 -Patch7: javacc-7.patch +Patch5: javacc-7.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: apache-parent BuildRequires: aqute-bnd +BuildRequires: docbook5-xsl-stylesheets BuildRequires: fdupes BuildRequires: glassfish-jsp-api BuildRequires: glassfish-servlet-api @@ -86,12 +85,11 @@ find -type f -name "*.jar" -delete find -type f -name "*.class" -delete -%patch1 +%patch1 -p1 %patch2 -p1 -%patch3 -%patch5 -%patch6 -%patch7 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 # Use system ivy settings rm ivysettings.xml @@ -117,16 +115,31 @@ %{mvn_file} org.%{name}:%{name} %{name} %build -ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom +JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 \ + ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom + +mkdir build/manual +for lang in en_US zh_CN; do + java -cp %{_javadir}/xalan-j2.jar:%{_javadir}/xalan-j2-serializer.jar \ + org.apache.xalan.xslt.Process \ + -OUT build/manual/manual-${lang}.xhtml \ + -XSL %{_datadir}/xml/docbook/stylesheet/nwalsh5/current/xhtml5/docbook.xsl \ + -IN src/manual/${lang}/book.xml +done +cp -rf src/manual/en_US/{figures,*.png} build/manual %install %{mvn_artifact} build/pom.xml build/%{name}.jar %mvn_install -J build/api %fdupes -s %{buildroot}%{_javadocdir} +install -dm0755 %{buildroot}%{_defaultdocdir}/%{name}/html +cp -rf build/manual/* %{buildroot}%{_defaultdocdir}/%{name}/html + %files -f .mfiles %doc README.md RELEASE-NOTES %license LICENSE NOTICE +%{_defaultdocdir}/%{name}/html %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE ++++++ enable-jdom.patch ++++++ --- /var/tmp/diff_new_pack.WA59mk/_old 2022-02-11 23:08:52.182852296 +0100 +++ /var/tmp/diff_new_pack.WA59mk/_new 2022-02-11 23:08:52.182852296 +0100 @@ -1,6 +1,8 @@ ---- src/main/java/freemarker/ext/jdom/NodeListModel.java.orig 2017-10-16 02:17:50.000000000 +0100 -+++ src/main/java/freemarker/ext/jdom/NodeListModel.java 2017-12-06 18:53:07.877967201 +0000 -@@ -661,7 +661,7 @@ +Index: freemarker-2.3.31/src/main/java/freemarker/ext/jdom/NodeListModel.java +=================================================================== +--- freemarker-2.3.31.orig/src/main/java/freemarker/ext/jdom/NodeListModel.java ++++ freemarker-2.3.31/src/main/java/freemarker/ext/jdom/NodeListModel.java +@@ -675,7 +675,7 @@ implements else if ("data".equals(localName)) attr = new Attribute("data", pi.getData()); else @@ -9,7 +11,7 @@ } else if (node instanceof DocType) { DocType doctype = (DocType) node; if ("publicId".equals(localName)) -@@ -762,17 +762,17 @@ +@@ -781,17 +781,17 @@ implements private static final Element getParent(Object node) { if (node instanceof Element) @@ -32,7 +34,7 @@ else // With 2.1 semantics it makes more sense to just return a null and let the core // throw an InvalidReferenceException and the template writer can use ?exists etcetera. (JR) -@@ -794,7 +794,7 @@ +@@ -815,7 +815,7 @@ implements LinkedList list = new LinkedList(); do { list.addFirst(parent); @@ -41,7 +43,7 @@ } while (parent != null); return list; } -@@ -808,7 +808,7 @@ +@@ -830,7 +830,7 @@ implements list.addFirst(node); do { list.addFirst(parent); @@ -50,7 +52,7 @@ } while (parent != null); return list; } -@@ -861,7 +861,7 @@ +@@ -885,7 +885,7 @@ implements Element parent = ((Attribute) node).getParent(); doc = parent == null ? null : parent.getDocument(); } else if (node instanceof Text) { @@ -59,9 +61,11 @@ doc = parent == null ? null : parent.getDocument(); } else if (node instanceof Document) doc = (Document) node; ---- src/main/java/freemarker/ext/xml/_JdomNavigator.java.orig 2012-03-01 01:56:25.000000000 +0100 -+++ src/main/java/freemarker/ext/xml/_JdomNavigator.java 2012-05-16 13:32:06.328559677 +0200 -@@ -122,7 +122,7 @@ +Index: freemarker-2.3.31/src/main/java/freemarker/ext/xml/_JdomNavigator.java +=================================================================== +--- freemarker-2.3.31.orig/src/main/java/freemarker/ext/xml/_JdomNavigator.java ++++ freemarker-2.3.31/src/main/java/freemarker/ext/xml/_JdomNavigator.java +@@ -122,7 +122,7 @@ public class _JdomNavigator extends Navi } else if ("data".equals(localName)) { result.add(new Attribute("data", pi.getData())); } else { @@ -70,7 +74,7 @@ } } else if (node instanceof DocType) { DocType doctype = (DocType) node; -@@ -186,7 +186,7 @@ +@@ -186,7 +186,7 @@ public class _JdomNavigator extends Navi Element parent = ((Attribute) node).getParent(); return parent == null ? null : parent.getDocument(); } else if (node instanceof Text) { ++++++ freemarker-2.3.28.tar.gz -> freemarker-2.3.31.tar.gz ++++++ ++++ 35236 lines of diff (skipped) ++++++ javacc-7.patch ++++++ --- /var/tmp/diff_new_pack.WA59mk/_old 2022-02-11 23:08:52.730853881 +0100 +++ /var/tmp/diff_new_pack.WA59mk/_new 2022-02-11 23:08:52.734853892 +0100 @@ -8,11 +8,11 @@ src/main/java/freemarker/core/TokenMgrError.java | 5 +++++ 2 files changed, 20 insertions(+), 1 deletion(-) -diff --git a/build.xml b/build.xml -index 6542da9..20d1d56 100644 ---- a/build.xml -+++ b/build.xml -@@ -160,13 +160,26 @@ +Index: freemarker-2.3.31/build.xml +=================================================================== +--- freemarker-2.3.31.orig/build.xml ++++ freemarker-2.3.31/build.xml +@@ -146,13 +146,26 @@ <mkdir dir="${_javaccOutputDir}" /> <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" /> @@ -41,7 +41,4 @@ <replace file="${_javaccOutputDir}/FMParser.java" token="private final LookaheadSuccess" --- -2.9.3 - ++++++ jsp-api.patch ++++++ --- /var/tmp/diff_new_pack.WA59mk/_old 2022-02-11 23:08:52.746853927 +0100 +++ /var/tmp/diff_new_pack.WA59mk/_new 2022-02-11 23:08:52.746853927 +0100 @@ -1,17 +1,19 @@ ---- build.xmlorig 2017-10-16 02:17:50.000000000 +0100 -+++ build.xml 2017-12-06 20:05:59.056142612 +0000 -@@ -303,36 +303,21 @@ +Index: freemarker-2.3.31/build.xml +=================================================================== +--- freemarker-2.3.31.orig/build.xml ++++ freemarker-2.3.31/build.xml +@@ -273,20 +273,19 @@ verify="yes" stubversion="1.2" /> - <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" /> + <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" /> <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" - debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" + debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8" includeantruntime="false" - classpathref="ivy.dep.jsp2.0" + classpathref="ivy.dep.jsp2.1" - bootclasspath="${boot.classpath.j2se1.5}" + bootclasspath="${boot.classpath.j2se1.7}" includes=" freemarker/ext/jsp/**, freemarker/ext/servlet/**, @@ -24,25 +26,11 @@ + freemarker/ext/jsp/FreeMarkerJspFactory2.java" /> -- <!-- There's no build.jsp2.0, as those classes are part of the common build subset. --> -- -- <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" /> -- <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" -- debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" -- includeantruntime="false" -- classpathref="ivy.dep.jsp2.1" -- bootclasspath="${boot.classpath.j2se1.5}" -- includes=" -- freemarker/ext/jsp/_FreeMarkerPageContext21.java, -- freemarker/ext/jsp/FreeMarkerJspFactory21.java, -- freemarker/ext/jsp/FreeMarkerJspApplicationContext.java" -- /> -- - <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" /> - <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" - debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8" ---- ivy.xml.orig 2018-03-30 22:03:42.000000000 +0100 -+++ ivy.xml 2018-08-22 08:53:03.369873853 +0100 + <!-- There's no build.jsp2.0, as those classes are part of the common build subset. --> +Index: freemarker-2.3.31/ivy.xml +=================================================================== +--- freemarker-2.3.31.orig/ivy.xml ++++ freemarker-2.3.31/ivy.xml @@ -45,9 +45,6 @@ description="for building FreeMarker without dependencies that optinal dependencies" /> ++++++ jython-compatibility.patch ++++++ --- /var/tmp/diff_new_pack.WA59mk/_old 2022-02-11 23:08:52.754853949 +0100 +++ /var/tmp/diff_new_pack.WA59mk/_new 2022-02-11 23:08:52.758853962 +0100 @@ -1,18 +1,19 @@ -diff -urEbwB freemarker-2.3.28/build.xml freemarker-2.3.28.new/build.xml ---- freemarker-2.3.28/build.xml 2019-06-26 18:01:53.406255406 +0200 -+++ freemarker-2.3.28.new/build.xml 2019-06-26 18:07:15.540248273 +0200 -@@ -318,38 +318,18 @@ - freemarker/ext/jsp/FreeMarkerJspFactory2.java" +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/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.5" source="1.5" encoding="utf-8" + 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.5}" + bootclasspath="${boot.classpath.j2se1.7}" includes=" freemarker/ext/ant/**, freemarker/template/utility/JythonRuntime.java, @@ -24,20 +25,20 @@ - - <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.5" source="1.5" encoding="utf-8" +- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8" - includeantruntime="false" - classpathref="ivy.dep.jython2.2" -- bootclasspath="${boot.classpath.j2se1.5}" +- bootclasspath="${boot.classpath.j2se1.7}" - includes=" - 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.5" source="1.5" encoding="utf-8" +- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8" - includeantruntime="false" - classpathref="ivy.dep.jython2.5" -- bootclasspath="${boot.classpath.j2se1.5}" +- bootclasspath="${boot.classpath.j2se1.7}" - includes=" + freemarker/ext/jython/_Jython20And21VersionAdapter.java, freemarker/ext/jython/_Jython25VersionAdapter.java" ++++++ no-javarebel.patch ++++++ --- /var/tmp/diff_new_pack.WA59mk/_old 2022-02-11 23:08:52.766853985 +0100 +++ /var/tmp/diff_new_pack.WA59mk/_new 2022-02-11 23:08:52.770853996 +0100 @@ -1,16 +1,20 @@ ---- build.xml.orig 2017-12-06 18:32:24.827024991 +0000 -+++ build.xml 2017-12-06 18:32:55.974897827 +0000 -@@ -264,6 +264,7 @@ +Index: freemarker-2.3.31/build.xml +=================================================================== +--- freemarker-2.3.31.orig/build.xml ++++ freemarker-2.3.31/build.xml +@@ -243,6 +243,7 @@ classpathref="ivy.dep" - bootclasspath="${boot.classpath.j2se1.5}" + bootclasspath="${boot.classpath.j2se1.7}" excludes=" + freemarker/ext/beans/JRebelClassChangeNotifier.java freemarker/core/_Java?*Impl.java, freemarker/ext/jsp/**, freemarker/ext/servlet/**, ---- ivy.xml.orig 2017-12-06 18:24:27.374972063 +0000 -+++ ivy.xml 2017-12-06 18:24:41.745913477 +0000 -@@ -122,8 +122,6 @@ +Index: freemarker-2.3.31/ivy.xml +=================================================================== +--- freemarker-2.3.31.orig/ivy.xml ++++ freemarker-2.3.31/ivy.xml +@@ -117,8 +117,6 @@ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" /> <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" />
