Hello community,
here is the log from the commit of package icu4j for openSUSE:Leap:15.2 checked
in at 2020-02-05 07:23:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/icu4j (Old)
and /work/SRC/openSUSE:Leap:15.2/.icu4j.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu4j"
Wed Feb 5 07:23:29 2020 rev:22 rq:762722 version:63.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/icu4j/icu4j.changes 2020-01-15
15:12:01.970127562 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.icu4j.new.26092/icu4j.changes 2020-02-05
07:23:39.746601256 +0100
@@ -1,0 +2,34 @@
+Wed Feb 13 12:42:12 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * icu4j-63.1-java8compat.patch
+ + Prevent use of Jdk >= 9 functions
+- Clean up the file and sanitize osgi bundle versions
+
+-------------------------------------------------------------------
+Tue Nov 27 12:56:30 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Distribute also the charset and localespi jars along with their
+ pom files.
+- Install the jars also to %{_javadir}%{name} directory for
+ compatibility reasons.
+
+-------------------------------------------------------------------
+Fri Nov 23 16:03:18 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * improve-osgi-manifest.patch
+
+-------------------------------------------------------------------
+Thu Nov 22 12:23:04 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Version update to 63.1
+ * updates to CLDR 34 locale data with many additions and
+ corrections, and some new languages.
+ * adds API for number and currency range formatting, and API for
+ additional Unicode properties and for constructing custom
+ properties.
+ * includex data for testing readiness for the upcoming Japanese
+ calendar era.
+
+-------------------------------------------------------------------
Old:
----
icu4j-60.2.tar.xz
New:
----
icu4j-63.1-java8compat.patch
icu4j-63.1.tar.xz
improve-osgi-manifest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icu4j.spec ++++++
--- /var/tmp/diff_new_pack.7kobRT/_old 2020-02-05 07:23:40.414601537 +0100
+++ /var/tmp/diff_new_pack.7kobRT/_new 2020-02-05 07:23:40.414601537 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icu4j
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -13,30 +13,33 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%global majorver 63
+%global minorver 1
+%global oldmajorver 62
Name: icu4j
-Version: 60.2
+Version: %{majorver}.%{minorver}
Release: 0
Summary: International Components for Unicode for Java
License: MIT AND EPL-1.0
Group: Development/Libraries/Java
-Url: http://site.icu-project.org/
+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-60-2/icu4j
icu4j-<version>
-#tar caf icu4j-<version>.tar.xz icu4j-<version>/
+#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
Patch0: icu4j-jdk10plus.patch
+# Add better OSGi metadata to core jar
+Patch1: improve-osgi-manifest.patch
+Patch2: icu4j-63.1-java8compat.patch
BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: java-devel
+BuildRequires: java-javadoc
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
-BuildRequires: unzip
-BuildRequires: zip
BuildArch: noarch
%description
@@ -54,6 +57,22 @@
richer APIs, while remaining as compatible as possible with the original
Java text and internationalization API design.
+%package charset
+Summary: Charset converter library of %{name}
+Group: Development/Libraries/Java
+Requires: %{name} = %{version}-%{release}
+
+%description charset
+Charset converter library of %{name}.
+
+%package localespi
+Summary: Locale SPI library of %{name}
+Group: Development/Libraries/Java
+Requires: %{name} = %{version}-%{release}
+
+%description localespi
+Locale SPI library of %{name}.
+
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
@@ -64,6 +83,8 @@
%prep
%setup -q
%patch0 -p1
+%patch1
+%patch2 -p1
sed -i 's/\r//' APIChangeReport.html
sed -i 's/\r//' readme.html
@@ -72,19 +93,33 @@
sed --in-place "s/<date datetime=.*when=\"after\"\/>//" build.xml
sed --in-place "/javac1.3/d" build.xml
sed --in-place "s:%{_prefix}/lib:%{_libdir}:g" build.xml
-rm -f tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet*.java
+
+rm tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet*
+
+# The versions in build.properties were not updated since some time
+rm build.properties
+echo "api.doc.version=%{version}" >> build.properties
+echo "maven.pom.ver=%{version}" >> build.properties
+echo "release.file.ver=%{majorver}_%{minorver}" >> build.properties
+echo "api.report.version=%{majorver}" >> build.properties
+echo "api.report.prev.version=%{oldmajorver}" >> build.properties
+echo "jar.spec.version=%{majorver}" >> build.properties
+echo "jar.impl.version=%{version}" >> build.properties
+echo "jar.impl.version.string=%{version}.0" >> build.properties
%build
ant \
-Dicu4j.javac.source=1.6 -Dicu4j.javac.target=1.6 \
- -Dj2se.apidoc=%{_javadocdir}/java \
+ -Dj2se.apidoc=%{_javadocdir}/java
-Dicu4j.api.doc.jdk.link=%{_javadocdir}/java \
jar docs
%install
# jars
-mkdir -p %{buildroot}%{_javadir}
-cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-
+mkdir -p %{buildroot}%{_javadir}/%{name}
+cp -ap %{name}*.jar %{buildroot}%{_javadir}/
+for jar in icu4j icu4j-charset icu4j-localespi ; do
+ ln -sf %{_javadir}/${jar}.jar %{buildroot}%{_javadir}/%{name}/${jar}.jar
+done
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
@@ -92,18 +127,24 @@
# maven stuff
install -d -m 755 %{buildroot}%{_mavenpomdir}
-cp maven/icu4j/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+for jar in icu4j icu4j-charset icu4j-localespi ; do
+ sed -i -e 's/@POMVERSION@/%{version}/' maven/$jar/pom.xml
+ cp maven/$jar/pom.xml %{buildroot}%{_mavenpomdir}/JPP-$jar.pom
+done
+%add_maven_depmap JPP-icu4j.pom icu4j.jar
+%add_maven_depmap JPP-icu4j-charset.pom icu4j-charset.jar -f charset
+%add_maven_depmap JPP-icu4j-localespi.pom icu4j-localespi.jar -f localespi
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc readme.html APIChangeReport.html
-%{_javadir}/%{name}*.jar
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
-%{_mavenpomdir}/*.pom
+%{_javadir}/%{name}/%{name}.jar
+
+%files charset -f .mfiles-charset
+%{_javadir}/%{name}/%{name}-charset.jar
+
+%files localespi -f .mfiles-localespi
+%{_javadir}/%{name}/%{name}-localespi.jar
%files javadoc
%{_javadocdir}/%{name}
++++++ icu4j-63.1-java8compat.patch ++++++
++++ 4403 lines (skipped)
++++++ icu4j-60.2.tar.xz -> icu4j-63.1.tar.xz ++++++
/work/SRC/openSUSE:Leap:15.2/icu4j/icu4j-60.2.tar.xz
/work/SRC/openSUSE:Leap:15.2/.icu4j.new.26092/icu4j-63.1.tar.xz differ: char
26, line 1
++++++ improve-osgi-manifest.patch ++++++
--- 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.
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;base=true;full=true;version="@IMPLVERSION@",
+ com.ibm.icu.math;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,
+ com.ibm.icu.impl.data;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.brkitr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@datavers...@b.coll;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@datavers...@b.curr;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@datavers...@b.lang;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@datavers...@b.rbnf;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.region;x-internal:=true,
+ com.ibm.icu.impl.data.icudt@DATAVERSION@b.translit;x-internal:=true,
+ 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
--- 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 @@
<filterset>
<filter token="SPECVERSION" value="${jar.spec.version}"/>
<filter token="IMPLVERSION" value="${jar.impl.version}"/>
+ <filter token="DATAVERSION" value="${icu4j.data.version}"/>
<filter token="COPYRIGHT" value="${jar.copyright.info}"/>
<filter token="EXECENV" value="${jar.exec.env}"/>
</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 @@
<filterset>
<filter token="SPECVERSION" value="${jar.spec.version}"/>
<filter token="IMPLVERSION" value="${jar.impl.version}"/>
+ <filter token="DATAVERSION" value="${icu4j.data.version}"/>
<filter token="COPYRIGHT" value="${jar.copyright.info}"/>
<filter token="EXECENV" value="${jar.exec.env}"/>
</filterset>
