- Update to release 68.1

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=132

baselibs.conf

@@ -1,4 +1,4 @@
-libicu67
+libicu68
 libicu-devel
 	requires -libicu-<targettype>
-	requires "libicu67-<targettype> = <version>"
+	requires "libicu68-<targettype> = <version>"

icu.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Oct 29 10:52:56 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 68.1
+  * CLDR 38
+  * Measurement unit preferences
+  * PluralRules selection for ranges of numbers
+  * Locale ID canonicalization now conforms to the CLDR spec
+    including edge cases
+  * DateIntervalFormat supports output options such as capitalization
+  * Measurement units are normalized in skeleton string output
+  * Time zone data (tzdata) version 2020d
+
 -------------------------------------------------------------------
 Sun May 31 16:50:18 UTC 2020 - Cliff Zhao <qzhao@suse.com>
 

icu.keyring

@@ -1,73 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=DEHc
------END PGP PUBLIC KEY BLOCK-----

icu.spec

@@ -16,9 +16,9 @@
 #
 
 
-%define lname	libicu67
-%define amajor   67
-%define aversion 67
+%define lname	libicu68
+%define amajor   68
+%define aversion 68
 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
 %define be_platform 1
 %else
@@ -26,7 +26,7 @@
 %endif
 # icu-versioning.diff needs update for new Version too
 Name:           icu
-Version:        67.1
+Version:        68.1
 Release:        0
 Summary:        International Components for Unicode
 License:        ICU
@@ -34,11 +34,10 @@ Group:          Development/Libraries/C and C++
 URL:            http://icu-project.org/
 
 #Git-Clone:	https://github.com/unicode-org/icu.git
-Source:         https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz
-Source2:        https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz.asc
-Source3:        https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-docs.zip
-Source4:        https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-docs.zip.asc
-Source5:        %name.keyring
+Source:         https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-src.tgz
+Source2:        https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-src.tgz.asc
+Source3:        https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-docs.zip
+Source4:        https://github.com/unicode-org/icu/releases/download/release-68-1/icu4c-68_1-docs.zip.asc
 Source100:      baselibs.conf
 Patch4:         icu-fix-install-mode-files.diff
 Patch6:         icu-error-reporting.diff
@@ -49,7 +48,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  unzip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       bundled(timezone) = 2020d
 
 %description
 ICU is a set of C and C++ libraries that provide extensive Unicode and locale
@@ -58,7 +57,7 @@ sensitive collation, date and time formatting, support for many locales,
 message catalogs and resources, message formatting, normalization, number and
 currency formatting, time zone support, transliteration, and word, line, and
 sentence breaking.
-/
+
 This subpackage contains the runtime programs for interacting with ICU.
 
 %package -n %lname
@@ -149,7 +148,7 @@ export CFLAGS="$CXXFLAGS"
 	--enable-shared \
 	--disable-samples \
 	--with-data-packaging=archive
-make %{?_smp_mflags} VERBOSE=1
+%make_build VERBOSE=1
 # Build the other endianess, too.
 pushd data/
 %if %be_platform
@@ -169,7 +168,7 @@ cp -a license.html readme.html "%buildroot/%_docdir/%name/"
 find . -name CVS -type d -exec rm -Rf "{}" "+"
 cd source
 
-make DESTDIR="%buildroot" install %{?_smp_mflags}
+%make_install
 cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/"
 
 #
@@ -224,7 +223,6 @@ ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE=
 %postun -n %lname -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %_bindir/derb
 %_bindir/gen*
 %_bindir/icuinfo
@@ -241,23 +239,19 @@ ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE=
 %_docdir/%name/readme.html
 
 %files -n %lname
-%defattr(-, root, root)
 %_libdir/libicu*.so.*
 
 %files -n libicu%aversion-bedata
-%defattr(-,root,root)
 %dir %_datadir/icu
 %dir %_datadir/icu/%version
 %_datadir/icu/%version/icudt%{amajor}b.dat
 
 %files -n libicu%aversion-ledata
-%defattr(-,root,root)
 %dir %_datadir/icu
 %dir %_datadir/icu/%version
 %_datadir/icu/%version/icudt%{amajor}l.dat
 
 %files -n libicu-devel
-%defattr(-, root, root)
 %_libdir/libicu*.so
 %_includedir/unicode/
 %dir %_libdir/icu/
@@ -272,7 +266,6 @@ ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE=
 %_datadir/icu/%version/config/
 
 %files -n libicu-doc
-%defattr(-,root,root)
 %dir %_docdir/%name/
 %_docdir/%name/html/
 

icu4c-67_1-docs.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5a2b188a3bd55252d5fbcce75d563ec1ab574e31de626b40dc7b797f03d89b4
-size 7913999

icu4c-67_1-docs.zip.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERWm7wJ2oRvyRy9Ic4bukRZPPKuAFAl6gqjAACgkQ4bukRZPP
-KuD3LxAAuSSupPokvys46e76TnDMKGFsTjFh1hJB/I6XqgfUjoxucppjQphxmWrg
-n7EA3bofwa4oQ6DtgRMUL4eJQlFmDRiKDNrKaoIPLsz8hY/Kg1DmLpIe7BDz5brI
-RlkWOr5sKE+wdLynR++liKhL75HVLxpwtcyfLzXIS1ltiRcCRZFOVasRD2B7TI2s
-UvTYTSBF/W/3SeaDDxBETJcGDU5Sut5YjqUQerWAfpYgULmyaT8jxKyL5G6vixc/
-Y/nTXwrUY5oopRCOmN9wp9nPWra3WOcEycgdrOSMNsQp9qj7DYxbP8n+Cq4FzqVZ
-e+8qNi4GOAB9triH5AgKwD0EKmlmJbF1x+Yf2gSB7SJ4l4TufNQgkM3zuoKOjJh6
-/sJ3bnDp6jj736mxL35XLBef0GoA0p8go1HIG83AhLiKPt6uUG9/BgViCDGba7Gi
-RTA3gt1TkYfbeIUlbtx7oy37CpSnM85WMcNh7LMN1QQcldsO41bmCP+daUTblpHg
-V9sgzVJyQYfu6V7wMwzMFFNIc8xtM+/kS2QEiFW25C1T4sl8RYjytV8WxRWl90Aa
-ONJtNb5dm8t70ym4uzdPjDMvhEAdtvyTMzmCrhL+387NdORBtEMwc4eR1ZziEDqZ
-pVWnmTNyOYhoWkCmst+d5CrmrTDO6OBQFKvrBwOBrO6cmSuI+To=
-=UswV
------END PGP SIGNATURE-----

icu4c-67_1-src.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
-size 24518055

icu4c-67_1-src.tgz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEERWm7wJ2oRvyRy9Ic4bukRZPPKuAFAl6gqi8ACgkQ4bukRZPP
-KuD4WRAAgo58c4232cIY0XnhwQ7IRp8rRPS2ol2JRhTbb3V6/NR71gA9holIvnMN
-X5fSUU3uHI5hk/ZJv+45/+/rKV3m7EdkzHIa9SlLM9XOZtarzI6grIUp9oSMU4GV
-H7hR8VFuxTFMXNJXruH8SB11/41xGedIs3rf6cGwDnE0U6S5Ze91vh4ItBor1I3Y
-q9OaaW6RVgvtIg9XWoLWw+lAO346aKabVL31qh1947+M2WcXd+dsQ5Db/26autYj
-PyQWOAL+6MyFmL7HiYDeVRIFvg853t7+oOPbIpWik+VzDMqG3zqKa7ZXfNz7l6Ta
-wojhw0NJXpDD3dPGvb4SQNQy6TEYq5JoNrvkk7ED2nLjUEtjqXram9vplys9DaEw
-SVpxh1vukkoaG0kPy81eisZ7dQo4bMf1KUOKaxIPgj1kGtI1rptwUMd+rwBMx9tv
-PkSCKGgBkhGaEvTrbVY9Vvy8QLb4rRTIyII0AiQvu7T4EhEwrzldcwRPBm0cik9c
-Q7V9cjweLptTTu/1MNgtxnwniIEkyQS+h3I2t7Dul3BPzcDmQvlPBvq7T8enjrYe
-X24HpHKL5WlviRnPNDu59o/pMag3N1b56x/jBy4VgD6a8HiyOUypB4SzQVAiE9o/
-mkzUm+QrCCeA+rqITgDG70Z/+c7wp921EU82/9Qq8OzkDeqrHo4=
-=f5LU
------END PGP SIGNATURE-----

icu4c-68_1-docs.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:697575709c24635b2b52eaa5d538da9b6d8185be373489d8d865265803dc67d1
+size 8074509

icu4c-68_1-docs.zip.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAl+aDQkACgkQX1blr6Y8
+zTNyGwwAq4cfIGbT7Xr3kAXFEaHxPTZjj3ykauqZMS1+KZIlw6qtWrkASya3H/bU
+5rXk1EN7uKS0wg1ygQLPs/nRMLo4rtdCvUVQQEfK4wGIMGTw7CBGu3ykCTj9UDpH
+K5m6kGH77AtbeBqJK+ZIZZSKNmTj2Ax41LnC2T7dR4jChVhLP3gL+4wMfNHKBOyO
+V1mjhAwCyLPJ7xu+yKRTebnqzL1T5pwYaDk6xW7Ik+iRuWglH/FbzZZLpdx0WdNz
+cE/O2eaN43wBPGdMdLBRTEq3uTLLeyUid9+LervBlNgSD3ArtVIEhCZZQRIrVKkJ
+hRMu2pe8/iUW7sgLaK1nBdXNMaQZuRmVQbOR4wPDJCbj5PUkvQlVyNz76pHJO6rK
+gL+kAlZ1GZvobWCy9XgWksAxrvEXi3aj/lPpleYHFaU8K8kxZR6FTqzcKSsVgjWd
+TzNh1pdhrw+z9HV29mKAuDzT8zgN6UvjIvizXCHKaKT1R0hP+lbkH8+8rtjQUn8J
+4zDBtToP
+=/o35
+-----END PGP SIGNATURE-----

icu4c-68_1-src.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d
+size 24722348

icu4c-68_1-src.tgz.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCgAdFiEEDlHn8G73GfvQcngqX1blr6Y8zTMFAl+aDEAACgkQX1blr6Y8
+zTNWcgwAjYusRSocj2BnmyhmHM/c8ldf6RqBwMyGPqTOYEWVA/WBlpHgHxhBf1sc
+maY3cu55PLOxV7VqaAnoJWm27AL0Msy5aFO3ggzFRbCo2MS5ZGCiD2swArIRsaP5
+8hnhkZCVeDFvmcr0mfjdFDMuific5VY3ZIkjHKBbLdLe44U8D3PC9dH34UWez/GU
+nrf1bbvFwLSbKsteB35qqqXn/vxc02wg+9A7JSPtSWA0Mc59tjSZjfUL30FdKW4b
+qArbHxarvnN3HYSkmAieJBUA+6f62nAQHd5EyJ1OZoHtaBaQ4AafSfIKt0vsANnz
+LdlM2zrxGAXrzRmUljdxQ+gKNguKUVfHFDAJotWNmKUKEGf/H8oSolyKoLVz0Gu5
+bUNGbpEDtIoPYAYvHOYXccqSM0bRyR0+lUIfc+aITJg7/Lx6tLI8x4W8KWI2zYQX
+JIt/MbiWok2FhpV93cMb+DUdrPPyxqCeMgGJ2wUhii+OMuk47OMOnYtc0cQ/Xq+Q
+azAp/B+C
+=y048
+-----END PGP SIGNATURE-----

locale.diff

@@ -9,8 +9,8 @@ Index: icu/source/common/putil.cpp
 ===================================================================
 --- icu.orig/source/common/putil.cpp
 +++ icu/source/common/putil.cpp
-@@ -1543,7 +1543,7 @@ static const char *uprv_getPOSIXIDForCat
-             /* Solaris speaks POSIX -  See IEEE Std 1003.1-2008 
+@@ -1607,7 +1607,7 @@ static const char *uprv_getPOSIXIDForCat
+             /* Solaris speaks POSIX -  See IEEE Std 1003.1-2008
               * This is needed to properly handle empty env. variables
               */
 -#if U_PLATFORM == U_PF_SOLARIS