SHA256
1
0
forked from pool/icu

Accepting request 207542 from X11:common:Factory

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/207542
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=45
This commit is contained in:
Stephan Kulow 2013-11-20 09:42:42 +00:00 committed by Git OBS Bridge
commit aea04b04df
9 changed files with 42 additions and 26 deletions

View File

@ -1,4 +1,4 @@
libicu51_2
libicu52_1
libicu-devel
requires -libicu-<targettype>
requires "libicu51_2-<targettype> = <version>"
requires "libicu52_1-<targettype> = <version>"

View File

@ -11,8 +11,8 @@ Thus, we will use the full version as the SO identifier in openSUSE.
Details:
U_ICU_VERSION_SHORT was (example) "49" before when there was a
libicui18n.so.49. Now, since there is a libicui18n.so.51.2, we need to
U_ICU_VERSION_SHORT was (example) "51" before when there was a
libicui18n.so.51. Now, since there is a libicui18n.so.51.2, we need to
change U_ICU_VERSION_SHORT. But the define's documentation says
"without dots", and I do not know how much downstream code depends on
the non-dot feature, if at all. Anyhow, to bypass this question to
@ -59,7 +59,7 @@ Index: icu/source/common/umapfile.c
===================================================================
--- icu.orig/source/common/umapfile.c
+++ icu/source/common/umapfile.c
@@ -58,7 +58,7 @@
@@ -61,7 +61,7 @@
# define LIB_PREFIX "lib"
# define LIB_SUFFIX ".dll"
/* This is inconvienient until we figure out what to do with U_ICUDATA_NAME in utypes.h */
@ -68,7 +68,7 @@ Index: icu/source/common/umapfile.c
# endif
#elif MAP_IMPLEMENTATION==MAP_STDIO
# include <stdio.h>
@@ -411,10 +411,10 @@
@@ -414,10 +414,10 @@
/* BUT FOR BATCH MODE IT IS AN EXCEPTION BECAUSE */
/* THE FIRST THREE LETTERS ARE PREASSIGNED TO THE */
/* PROJECT!!!!! */
@ -104,8 +104,8 @@ Index: icu/source/common/unicode/uvernum.h
@@ -58,6 +58,7 @@
* @stable ICU 2.4
*/
#define U_ICU_VERSION_MAJOR_NUM 51
+#define U_ICU_VERSION_MAJOR_STR "51"
#define U_ICU_VERSION_MAJOR_NUM 52
+#define U_ICU_VERSION_MAJOR_STR "52"
/** The current ICU minor version as an integer.
* This value will change in the subsequent releases of ICU
@ -113,7 +113,7 @@ 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 _51
-#define U_ICU_VERSION_SUFFIX _52
+#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)
@ -124,8 +124,8 @@ 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_SHORT "51"
+#define U_ICU_VERSION_SHORT "51_2"
-#define U_ICU_VERSION_SHORT "52"
+#define U_ICU_VERSION_SHORT "52_1"
#ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C.

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Nov 12 04:06:28 UTC 2013 - jengelh@inai.de
- Update to new upstream release 52.1
* Unicode 6.3: New bidi control codes, new Bidi_Class property
values, two new bidi "bracket" properties; for other property
value changes see the UAX #44 summary.
* CLDR 24: Improved coverage for top 70+ languages, fractional
plural rules and forms, many new measurement units, major
simplification of collation rule syntax, preliminary version of
European Ordering Rules, new relative fields.
* New API for converting between Windows time zone ID and IANA tz
database ID.
* Implement support for plurals that depend on displayed fractional
values
-------------------------------------------------------------------
Mon Jul 29 18:34:20 UTC 2013 - dvaleev@suse.com

View File

@ -17,10 +17,10 @@
Name: icu
%define lname libicu51_2
Version: 51.2
%define lname libicu52_1
Version: 52.1
Release: 0
%define aversion 51_2
%define aversion 52_1
Summary: International Components for Unicode
License: MIT
Group: Development/Libraries/C and C++
@ -236,9 +236,9 @@ fi;
%dir %_datadir/icu
%dir %_datadir/icu/%version
%ifarch %sparc mips hppa ppc ppc64 s390x
%_datadir/icu/%version/icudt51b.dat
%_datadir/icu/%version/icudt52b.dat
%else
%_datadir/icu/%version/icudt51l.dat
%_datadir/icu/%version/icudt52l.dat
%endif
%files -n libicu-devel

View File

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

View File

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

3
icu4c-52_1-docs.tar.xz Normal file
View File

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

3
icu4c-52_1-src.tar.xz Normal file
View File

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

View File

@ -1,7 +1,7 @@
#!/bin/sh -ex
ver="51.2"
name="icu4c-51_2-docs.zip"
ver="52.1"
name="icu4c-52_1-docs.zip"
# Put docs in a separate directory
wget -c "http://download.icu-project.org/files/icu4c/$ver/$name"
@ -9,7 +9,7 @@ rm -Rf html
mkdir html
pushd html
unzip "../$name"
if [ -x "$(which optipng)" ]; then optipng *.png; fi
popd
tar --use=xz -cvf "${name%.zip}.tar.xz" html
rm "$name"
rm -Rf html