Hello community,
here is the log from the commit of package icu4j for openSUSE:Factory checked
in at 2020-04-05 20:52:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icu4j (Old)
and /work/SRC/openSUSE:Factory/.icu4j.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu4j"
Sun Apr 5 20:52:52 2020 rev:15 rq:791183 version:66.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/icu4j/icu4j.changes 2020-01-30
09:31:48.029181845 +0100
+++ /work/SRC/openSUSE:Factory/.icu4j.new.3248/icu4j.changes 2020-04-05
20:52:55.449146968 +0200
@@ -1,0 +2,10 @@
+Thu Apr 2 08:32:08 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Version update to 66.1
+- Changed patches:
+ * icu4j-jdk10plus.patch
+ * improve-osgi-manifest.patch
+ * icu4j-63.1-java8compat.patch -> icu4j-66.1-java8compat.patch
+ + rediff to changed context
+
+-------------------------------------------------------------------
Old:
----
icu4j-63.1-java8compat.patch
icu4j-63.1.tar.xz
New:
----
icu4j-66.1-java8compat.patch
icu4j-66_1.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icu4j.spec ++++++
--- /var/tmp/diff_new_pack.zpy27r/_old 2020-04-05 20:52:56.553148024 +0200
+++ /var/tmp/diff_new_pack.zpy27r/_new 2020-04-05 20:52:56.553148024 +0200
@@ -17,25 +17,23 @@
#
-%global majorver 63
+%global majorver 66
%global minorver 1
-%global oldmajorver 62
Name: icu4j
Version: %{majorver}.%{minorver}
Release: 0
Summary: International Components for Unicode for Java
-License: MIT AND EPL-1.0
+# ICU itself is now covered by Unicode license, but still has contributed
+# components covered by MIT and BSD licenses
+# Data from the Timezone Database is Public Domain
+License: Unicode AND MIT AND BSD-3-Clause AND SUSE-Public-Domain
Group: Development/Libraries/Java
URL: http://site.icu-project.org/
-#CAUTION
-#to create a tarball use following procedure
-#svn co
http://source.icu-project.org/repos/icu/tags/release-%{majorver}-%{minorver}/icu4j
icu4j-%{majorver}.%{minorver}
-#tar caf icu4j-%{majorver}.%{minorver}.tar.xz icu4j-%{majorver}.%{minorver}/
-Source0: %{name}-%{version}.tar.xz
+Source0:
https://github.com/unicode-org/icu/releases/download/release-%{majorver}-%{minorver}/%{name}-%{majorver}_%{minorver}.tgz
Patch0: icu4j-jdk10plus.patch
# Add better OSGi metadata to core jar
Patch1: improve-osgi-manifest.patch
-Patch2: icu4j-63.1-java8compat.patch
+Patch2: icu4j-66.1-java8compat.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel
@@ -78,10 +76,10 @@
Group: Documentation/HTML
%description javadoc
-Javadoc documentation for %{name}.
+API documentation for %{name}.
%prep
-%setup -q
+%setup -q -c
%patch0 -p1
%patch1
%patch2 -p1
@@ -107,11 +105,26 @@
echo "jar.impl.version=%{version}" >> build.properties
echo "jar.impl.version.string=%{version}.0" >> build.properties
+# Missing dep on pl.pragmatists:JUnitParams for tests, so delete tests that
+# requires it for now
+sed -i -e '/pl.pragmatists/d' ivy.xml
+rm main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenFormatTest.java
+rm
main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java
+rm main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
+rm main/tests/core/src/com/ibm/icu/dev/test/serializable/CoverageTest.java
+rm main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java
+rm main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java
+rm
main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorDisorderedMarksTest.java
+
%build
ant \
- -Dicu4j.javac.source=1.6 -Dicu4j.javac.target=1.6 \
+ -Dicu4j.javac.source=1.7 -Dicu4j.javac.target=1.7 \
jar docs
+for jar in icu4j icu4j-charset icu4j-localespi ; do
+ sed -i -e 's/@POMVERSION@/%{version}/' maven/$jar/pom.xml
+done
+
%install
# jars
mkdir -p %{buildroot}%{_javadir}/%{name}
++++++ icu4j-63.1-java8compat.patch -> icu4j-66.1-java8compat.patch ++++++
++++ 1697 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/icu4j/icu4j-63.1-java8compat.patch
++++ and /work/SRC/openSUSE:Factory/.icu4j.new.3248/icu4j-66.1-java8compat.patch
++++++ icu4j-jdk10plus.patch ++++++
--- /var/tmp/diff_new_pack.zpy27r/_old 2020-04-05 20:52:56.593148062 +0200
+++ /var/tmp/diff_new_pack.zpy27r/_new 2020-04-05 20:52:56.593148062 +0200
@@ -1,63 +1,38 @@
---- icu4j-60.2/build.xml 2017-12-22 13:42:19.176489521 +0100
-+++ icu4j-60.2/build.xml 2017-12-22 14:05:58.358749213 +0100
-@@ -102,10 +102,20 @@
- <matches string="${java.version}" pattern="9((-.|\.\d).*)?"/>
- </condition>
-
-+ <condition property="is.java10">
-+ <matches string="${java.version}" pattern="10((-.|\.\d).*)?"/>
-+ </condition>
-+
-+ <condition property="is.java11">
-+ <matches string="${java.version}" pattern="11((-.|\.\d).*)?"/>
-+ </condition>
-+
- <condition property="is.java8.plus">
- <or>
- <isset property="is.java8"/>
- <isset property="is.java9"/>
-+ <isset property="is.java10"/>
-+ <isset property="is.java11"/>
- </or>
- </condition>
-
-@@ -1317,9 +1327,7 @@
+--- icu4j-66.1/build.xml 2020-03-11 19:21:41.000000000 +0100
++++ icu4j-66.1/build.xml 2020-04-02 09:57:11.221067239 +0200
+@@ -1314,8 +1314,6 @@
docencoding="UTF-8"
charset="UTF-8"
bottom="${icu4j.api.doc.copyright.footer}"
- additionalparam="${doclint.option} -breakiterator -use
-tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet
com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet
-J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
- link="${icu4j.api.doc.jdk.link}"
-- source="1.5"
-+ source="1.6"
+ source="1.7"
stylesheetfile="${docs.style.sheet}"
failonerror="true">
- <packageset dir="${icu4j.core.dir}/src">
-@@ -1353,9 +1361,7 @@
+@@ -1350,8 +1348,6 @@
docencoding="UTF-8"
charset="UTF-8"
bottom="${icu4j.api.doc.copyright.footer}"
- additionalparam="${doclint.option} -breakiterator -use
-tagletpath ${icu4j.build-tools.jar} -taglet
com.ibm.icu.dev.tool.docs.ICUTaglet"
- link="${icu4j.api.doc.jdk.link}"
-- source="1.5"
-+ source="1.6"
+ source="1.7"
failonerror="true">
<packageset dir="${icu4j.core.dir}/src">
- <include name="com/ibm/icu/lang/**"/>
-@@ -1398,7 +1404,7 @@
+@@ -1395,7 +1391,7 @@
docencoding="UTF-8"
charset="UTF-8"
bottom="${icu4j.api.doc.copyright.footer}"
- additionalparam="${doclint.option} -breakiterator -use
-tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet
com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet
-J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
+ additionalparam="${doclint.option} -breakiterator -use
-J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
link="${icu4j.api.doc.jdk.link}"
- source="1.5"
+ source="1.7"
stylesheetfile="${docs.style.sheet}"
-@@ -1437,7 +1443,7 @@
+@@ -1434,7 +1430,7 @@
docencoding="UTF-8"
charset="UTF-8"
bottom="${icu4j.api.doc.copyright.footer}"
- additionalparam="${doclint.option} -breakiterator -use
-tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet
com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet
-J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8"
+ additionalparam="${doclint.option} -breakiterator -use
-tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet
ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src}
-J-Dfile.encoding=UTF-8"
link="${icu4j.api.doc.jdk.link}"
- source="1.5"
+ source="1.7"
stylesheetfile="${docs.style.sheet}"
++++++ improve-osgi-manifest.patch ++++++
--- /var/tmp/diff_new_pack.zpy27r/_old 2020-04-05 20:52:56.601148070 +0200
+++ /var/tmp/diff_new_pack.zpy27r/_new 2020-04-05 20:52:56.601148070 +0200
@@ -1,20 +1,13 @@
---- manifest.stub.orig 2014-11-17 14:56:10.568212293 +0000
-+++ manifest.stub 2014-11-17 15:00:31.395686692 +0000
-@@ -9,10 +9,28 @@
- Bundle-ManifestVersion: 2
- Bundle-Name: ICU4J
- Bundle-Description: International Components for Unicode for Java
--Bundle-SymbolicName: com.ibm.icu
-+Bundle-SymbolicName: com.ibm.icu; singleton:=true
- Bundle-Version: @IMPLVERSION@
- Bundle-Vendor: Unicode, Inc.
+--- manifest.stub.orig 2018-11-27 10:26:04.174847598 +0000
++++ manifest.stub 2018-11-27 10:27:14.685508767 +0000
+@@ -15,5 +15,23 @@
Bundle-Copyright: @COPYRIGHT@
Bundle-RequiredExecutionEnvironment: @EXECENV@
Main-Class: com.ibm.icu.util.VersionInfo
--Export-Package:
com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.text,com.ibm.icu.util
-\ No newline at end of file
+-Export-Package:
com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util
+Export-Package: com.ibm.icu.lang;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.math;base=true;full=true;version="@IMPLVERSION@",
++ com.ibm.icu.number;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.text;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.util;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.impl;x-internal:=true,
@@ -30,8 +23,8 @@
+ com.ibm.icu.impl.data.icudt@datavers...@b.zone;x-internal:=true,
+ com.ibm.icu.impl.duration;x-internal:=true,
+ com.ibm.icu.impl.locale;x-internal:=true
-+Eclipse-LazyStart: true
-+Eclipse-ExtensibleAPI: true
++Bundle-ActivationPolicy: lazy
+ Automatic-Module-Name: com.ibm.icu
--- main/shared/build/common-targets.xml.orig 2014-11-17 14:59:05.335849961
+0000
+++ main/shared/build/common-targets.xml 2014-11-17 14:59:36.868423736
+0000
@@ -75,6 +75,7 @@
@@ -44,7 +37,7 @@
</filterset>
--- build.xml.orig 2014-11-17 21:45:53.308610711 +0000
+++ build.xml 2014-11-17 21:46:29.969096734 +0000
-@@ -693,6 +693,7 @@
+@@ -683,6 +683,7 @@
<filterset>
<filter token="SPECVERSION" value="${jar.spec.version}"/>
<filter token="IMPLVERSION" value="${jar.impl.version}"/>
