Accepting request 561139 from X11:common:Factory

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/561139
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=59

baselibs.conf

@@ -1,4 +1,4 @@
-libicu59_1
+libicu60_2
 libicu-devel
 	requires -libicu-<targettype>
-	requires "libicu59_1-<targettype> = <version>"
+	requires "libicu60_2-<targettype> = <version>"

icu-versioning.diff

@@ -78,8 +78,8 @@ Index: icu/source/common/unicode/uvernum.h
 @@ -59,6 +59,7 @@
   *  @stable ICU 2.4
   */
- #define U_ICU_VERSION_MAJOR_NUM 59
+ #define U_ICU_VERSION_MAJOR_NUM 60
-+#define U_ICU_VERSION_MAJOR_STR "59"
++#define U_ICU_VERSION_MAJOR_STR "60"
  
  /** The current ICU minor version as an integer.
   *  This value will change in the subsequent releases of ICU
@@ -87,22 +87,22 @@ Index: icu/source/common/unicode/uvernum.h
   *  This value will change in the subsequent releases of ICU
   *  @stable ICU 2.6
   */
--#define U_ICU_VERSION_SUFFIX _59
+-#define U_ICU_VERSION_SUFFIX _60
 +#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor
 +#define ___icu_version_glue(major, minor) ___icu_version_expand(major, minor)
 +#define U_ICU_VERSION_SUFFIX ___icu_version_glue(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM)
  
  /**
   * \def U_DEF2_ICU_ENTRY_POINT_RENAME
-@@ -126,7 +129,7 @@
+@@ -125,7 +128,7 @@
+  *  This value will change in the subsequent releases of ICU
   *  @stable ICU 2.6
   */
- #if U_PLATFORM_HAS_WINUWP_API == 0
+-#define U_ICU_VERSION_SHORT "60"
--#define U_ICU_VERSION_SHORT "59"
++#define U_ICU_VERSION_SHORT "60_2"
-+#define U_ICU_VERSION_SHORT "59_1"
+ 
- #else
+ #ifndef U_HIDE_INTERNAL_API
- // U_DISABLE_RENAMING does not impact dat file name
+ /** Data version in ICU4C.
- #define U_ICU_VERSION_SHORT
 Index: icu/source/config/mh-linux
 ===================================================================
 --- icu.orig/source/config/mh-linux

icu.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Dec 26 13:45:03 UTC 2017 - jengelh@inai.de
+
+- Drop dangling symlinks /usr/lib64/icu/*.inc
+
+-------------------------------------------------------------------
+Thu Dec 14 17:56:54 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 60.2
+  * ICU 60 provides full support for the Unicode 10.0 release
+    with many new characters and many property improvements.
+    Locale data is updated to CLDR 32, which adds several
+    languages and data improvements. A new number formatting API
+    has been added.
+
 -------------------------------------------------------------------
 Wed Aug  2 20:16:08 UTC 2017 - jengelh@inai.de
 

icu.spec

@@ -16,16 +16,16 @@
 #
 
 
-%define lname	libicu59_1
+%define lname	libicu60_2
-%define amajor   59
+%define amajor   60
-%define aversion 59_1
+%define aversion 60_2
 %ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
 %define be_platform 1
 %else
 %define be_platform 0
 %endif
 Name:           icu
-Version:        59.1
+Version:        60.2
 Release:        0
 Summary:        International Components for Unicode
 License:        ICU
@@ -136,20 +136,6 @@ ICU is a set of C and C++ libraries that provide extensive Unicode
 and locale support.
 This package contains the HTML documentation.
 
-%package data
-Summary:        International Components for Unicode (Sources for the Data in ICU)
-Group:          Development/Sources
-Requires:       %lname >= %version
-
-%description data
-ICU is a set of C and C++ libraries that provide extensive Unicode
-and locale support.
-
-This package contains the uncompiled source files for the data found
-in the "icu" package. This data describes the Unicode data (normative
-and informative) and also all the table-based converters provided in
-the ICU distribution.
-
 %prep
 %setup -q -n icu
 %patch -P 3 -P 4 -P 6 -P 7 -P 8 -p1
@@ -220,10 +206,17 @@ install -m 644 data/unidata/*.txt "%buildroot/%_datadir/icu/%version/unidata"
 ln -s unidata/UnicodeData.txt "%buildroot/%_datadir/icu/%version/"
 
 rm "%buildroot/%_datadir/icu/%version/install-sh"
+# Seems unused
+rm -Rf "%buildroot/%_datadir/icu/%version/unidata/" \
+	"%buildroot/%_datadir/icu/%version/UnicodeData.txt" \
+	"%buildroot/%_libdir/icu/current" \
+	"%buildroot/%_libdir/icu/Makefile.inc" \
+	"%buildroot/%_libdir/icu/pkgdata.inc"
 
 %fdupes %buildroot/%_prefix
 
 %check
+# s390x see: https://ssl.icu-project.org/trac/ticket/13095
 cd source
 %if !0%{?qemu_user_space_build:1}
 # Checks disabled in qemu because of races happening when we emulate
@@ -259,9 +252,6 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir %_libdir/icu
-%dir %_libdir/icu/%version
-%_libdir/icu/current
 %_bindir/derb
 %_bindir/gen*
 %_bindir/icuinfo
@@ -301,8 +291,6 @@ fi
 %dir %_libdir/icu/%version/
 %_libdir/icu/%version/Makefile.inc
 %_libdir/icu/%version/pkgdata.inc
-%_libdir/icu/Makefile.inc
-%_libdir/icu/pkgdata.inc
 %_libdir/pkgconfig/icu-*.pc
 %_bindir/icu-config
 %dir %_datadir/icu/
@@ -315,11 +303,4 @@ fi
 %dir %_docdir/%name/
 %_docdir/%name/html/
 
-%files data
-%defattr(-, root, root)
-%dir %_datadir/icu/
-%dir %_datadir/icu/%version/
-%_datadir/icu/%version/unidata/
-%_datadir/icu/%version/UnicodeData.txt
-
 %changelog

icu4c-59_1-docs.zip

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

icu4c-59_1-src.tgz

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

icu4c-60_2-docs.zip

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

icu4c-60_2-src.tgz

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

xlocale.patch

@@ -4,23 +4,22 @@ Date: Mon, 31 Jul 2017 12:19:40 +0000
 don't use obsolete <xlocale.h>
 
 ---
- source/i18n/digitlst.cpp |    6 +-----
+ source/i18n/digitlst.cpp |    4 ----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ 1 file changed, 4 deletions(-)
 
 Index: icu/source/i18n/digitlst.cpp
 ===================================================================
 --- icu.orig/source/i18n/digitlst.cpp
 +++ icu/source/i18n/digitlst.cpp
-@@ -61,11 +61,7 @@
+@@ -62,11 +62,7 @@
  #endif
  
  #if U_USE_STRTOD_L
--# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+-# if U_HAVE_XLOCALE_H
--#   include <locale.h>
--# else
 -#   include <xlocale.h>
+-# else
+ #   include <locale.h>
 -# endif
-+# include <locale.h>
  #endif
  
  // ***************************************************************************