Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package stringtemplate for openSUSE:Factory checked in at 2023-10-26 17:13:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stringtemplate (Old) and /work/SRC/openSUSE:Factory/.stringtemplate.new.24901 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stringtemplate" Thu Oct 26 17:13:31 2023 rev:3 rq:1120340 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/stringtemplate/stringtemplate.changes 2022-03-20 20:56:54.698644132 +0100 +++ /work/SRC/openSUSE:Factory/.stringtemplate.new.24901/stringtemplate.changes 2023-10-26 17:14:17.824000209 +0200 @@ -1,0 +2,8 @@ +Wed Oct 25 15:39:51 UTC 2023 - Fridrich Strba <[email protected]> + +- Added patch: + * stringtemplate-ambiguous.patch + + disambiguate between org.antlr.stringtemplate.StringTemplate + and the new java.lang.StringTemplate from jdk 21 + +------------------------------------------------------------------- New: ---- stringtemplate-ambiguous.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stringtemplate.spec ++++++ --- /var/tmp/diff_new_pack.ZQ39Mt/_old 2023-10-26 17:14:19.404058239 +0200 +++ /var/tmp/diff_new_pack.ZQ39Mt/_new 2023-10-26 17:14:19.404058239 +0200 @@ -1,7 +1,7 @@ # # spec file for package stringtemplate # -# 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 @@ -23,17 +23,18 @@ License: BSD-3-Clause Group: Development/Libraries/Java URL: https://www.stringtemplate.org/ -Source0: http://www.stringtemplate.org/download/stringtemplate-%{version}.tar.gz +Source0: http3://www.stringtemplate.org/download/stringtemplate-%{version}.tar.gz # Build jUnit tests + make the antlr2 generated code before preparing sources Patch0: stringtemplate-3.1-build-junit.patch Patch1: stringtemplate-3.2.1-sourcetarget.patch +Patch2: stringtemplate-ambiguous.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: ant-junit BuildRequires: antlr BuildRequires: fdupes -BuildRequires: java-devel -BuildRequires: javapackages-local +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 Requires: mvn(antlr:antlr) BuildArch: noarch @@ -56,6 +57,7 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build rm -rf lib target @@ -68,14 +70,18 @@ javadocs %install -install -D build/stringtemplate.jar %{buildroot}%{_datadir}/java/stringtemplate.jar -install -dm 755 %{buildroot}%{_javadocdir}/%{name} +#jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 build/stringtemplate.jar %{buildroot}%{_javadir}/%{name}.jar + +install -dm 0755 %{buildroot}%{_mavenpomdir} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar + +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pR docs/api/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} -install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom stringtemplate.jar - %files -f .mfiles %license LICENSE.txt %doc README.txt ++++++ stringtemplate-ambiguous.patch ++++++ --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/action.g 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/action.g 2023-10-25 17:30:54.086240658 +0200 @@ -27,6 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.antlr.stringtemplate.language; +import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.util.*; } --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/angle.bracket.template.g 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/angle.bracket.template.g 2023-10-25 17:30:37.242794510 +0200 @@ -27,6 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.antlr.stringtemplate.language; + import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.io.*; } --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/eval.g 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/eval.g 2023-10-25 17:22:13.866058127 +0200 @@ -27,6 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.antlr.stringtemplate.language; +import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.util.*; import java.io.*; --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/group.g 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/group.g 2023-10-25 17:30:58.966273338 +0200 @@ -27,6 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.antlr.stringtemplate.language; +import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.util.*; } --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/interface.g 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/interface.g 2023-10-25 17:30:19.806011061 +0200 @@ -27,6 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.antlr.stringtemplate.language; +import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.util.*; } --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/template.g 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/language/template.g 2023-10-25 17:30:47.012859948 +0200 @@ -27,6 +27,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.antlr.stringtemplate.language; + import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.io.*; } --- stringtemplate-3.2.1/src/org/antlr/stringtemplate/misc/StringTemplateTreeView.java 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/src/org/antlr/stringtemplate/misc/StringTemplateTreeView.java 2023-10-25 17:33:20.230552815 +0200 @@ -28,6 +28,7 @@ package org.antlr.stringtemplate.misc; +import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import java.awt.*; import java.awt.event.*; --- stringtemplate-3.2.1/test/org/antlr/stringtemplate/test/TestStringTemplate.java 2023-10-25 17:18:21.191150047 +0200 +++ stringtemplate-3.2.1/test/org/antlr/stringtemplate/test/TestStringTemplate.java 2023-10-25 17:34:28.124340910 +0200 @@ -28,6 +28,7 @@ package org.antlr.stringtemplate.test; import junit.framework.TestCase; +import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.*; import org.antlr.stringtemplate.language.AngleBracketTemplateLexer; import org.antlr.stringtemplate.language.DefaultTemplateLexer;
