Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ecj for openSUSE:Factory checked in
at 2022-03-20 20:55:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ecj (Old)
and /work/SRC/openSUSE:Factory/.ecj.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ecj"
Sun Mar 20 20:55:46 2022 rev:30 rq:963277 version:4.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/ecj/ecj.changes 2022-01-10 23:54:26.464848396
+0100
+++ /work/SRC/openSUSE:Factory/.ecj.new.25692/ecj.changes 2022-03-20
20:56:07.126575685 +0100
@@ -1,0 +2,12 @@
+Sun Mar 20 13:35:05 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * encoding.patch
+ + the encoding needs to be set for all JDK versions
+- Modified patch:
+ * ecj-rpmdebuginfo.patch
+ + rediff
+ * javaAPI.patch
+ + extract the encoding part to a separate patch
+
+-------------------------------------------------------------------
New:
----
encoding.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ecj.spec ++++++
--- /var/tmp/diff_new_pack.I2IqVO/_old 2022-03-20 20:56:07.814576675 +0100
+++ /var/tmp/diff_new_pack.I2IqVO/_new 2022-03-20 20:56:07.818576681 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ecj
#
-# Copyright (c) 2021 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
@@ -40,8 +40,9 @@
Source4: MANIFEST.MF
# Always generate debug info when building RPMs
Patch0: %{name}-rpmdebuginfo.patch
+Patch1: encoding.patch
# Include java API stubs in build with java < 15
-Patch1: javaAPI.patch
+Patch2: javaAPI.patch
BuildRequires: ant
BuildRequires: java-devel >= 10
BuildRequires: javapackages-local
@@ -55,8 +56,9 @@
%prep
%setup -q -c -a 1
%patch0 -p1
+%patch1 -p1
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
-%patch1
+%patch2
%endif
sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
@@ -79,7 +81,7 @@
# Remove everything except the jar, since ant looks for java files in "."
rm -rf java15api-src build/classes
-ant \
+%ant \
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
-Djavaapi=java15api.jar \
%endif
++++++ ecj-rpmdebuginfo.patch ++++++
--- /var/tmp/diff_new_pack.I2IqVO/_old 2022-03-20 20:56:07.866576750 +0100
+++ /var/tmp/diff_new_pack.I2IqVO/_new 2022-03-20 20:56:07.874576761 +0100
@@ -7,7 +7,7 @@
diff -u -r1.327 Main.java
--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 21 Apr 2008
15:00:59 -0000 1.327
+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Nov 2008
19:26:57 -0000
-@@ -2609,6 +2609,29 @@
+@@ -3097,6 +3097,29 @@ public void configure(String[] argv) {
this.options.put(CompilerOptions.OPTION_Process_Annotations,
CompilerOptions.ENABLED);
}
++++++ encoding.patch ++++++
--- ecj-4.18.orig/build.xml 2022-03-20 14:23:39.947886348 +0100
+++ ecj-4.18/build.xml 2022-03-20 14:26:28.600913037 +0100
@@ -24,6 +24,7 @@
<mkdir dir="${output}" />
<javac srcdir="${basedir}" destdir="${output}"
+ encoding="utf-8"
debuglevel="lines,source"
source="1.8"
target="1.8">
++++++ javaAPI.patch ++++++
--- /var/tmp/diff_new_pack.I2IqVO/_old 2022-03-20 20:56:07.914576819 +0100
+++ /var/tmp/diff_new_pack.I2IqVO/_new 2022-03-20 20:56:07.918576825 +0100
@@ -1,6 +1,6 @@
--- build.xml.orig 2020-09-02 22:05:12.000000000 +0200
+++ build.xml 2021-03-16 14:41:19.331235267 +0100
-@@ -18,16 +18,20 @@
+@@ -18,6 +18,9 @@
<property name="output" value="bin" />
<property name="jar_file" value="ecj.jar" />
@@ -10,10 +10,7 @@
<target name="build">
<delete file="${basedir}/${jar_file}" failonerror="no" />
<delete dir="${output}" failonerror="no" />
- <mkdir dir="${output}" />
-
- <javac srcdir="${basedir}" destdir="${output}"
-+ encoding="utf-8"
+@@ -28,7 +31,7 @@
debuglevel="lines,source"
source="1.8"
target="1.8">
