rpm/icu
SHA256
1
0
Fork 0
forked from pool/icu
Code Pull Requests Activity

Accepting request 304941 from X11:common:Factory

Browse Source 
- Version bump to latest release 55.1:

OBS-URL: https://build.opensuse.org/request/show/304941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=53
This commit is contained in:
Stephan Kulow 2015-05-07 07:20:46 +00:00 committed by Git OBS Bridge
commit c2c9b50ffb
9 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@ -1,4 +1,4 @@
libicu54_1 libicu55_1
libicu-devel libicu-devel
requires -libicu-<targettype> requires -libicu-<targettype>
requires "libicu54_1-<targettype> = <version>" requires "libicu55_1-<targettype> = <version>"

16
icu-versioning.diff
View File

@ -46,7 +46,7 @@ Index: icu/source/common/icuplug.cpp
=================================================================== ===================================================================
--- icu.orig/source/common/icuplug.cpp --- icu.orig/source/common/icuplug.cpp
+++ icu/source/common/icuplug.cpp +++ icu/source/common/icuplug.cpp
@@ -751,7 +751,7 @@ uplug_init(UErrorCode *status) { @@ -752,7 +752,7 @@ uplug_init(UErrorCode *status) {
pluginFile.append(plugin_dir, *status); pluginFile.append(plugin_dir, *status);
pluginFile.append(U_FILE_SEP_STRING, -1, *status); pluginFile.append(U_FILE_SEP_STRING, -1, *status);
pluginFile.append("icuplugins", -1, *status); pluginFile.append("icuplugins", -1, *status);
@ -104,8 +104,8 @@ Index: icu/source/common/unicode/uvernum.h
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
* @stable ICU 2.4 * @stable ICU 2.4
*/ */
#define U_ICU_VERSION_MAJOR_NUM 54 #define U_ICU_VERSION_MAJOR_NUM 55
+#define U_ICU_VERSION_MAJOR_STR "54" +#define U_ICU_VERSION_MAJOR_STR "55"
/** The current ICU minor version as an integer. /** The current ICU minor version as an integer.
* This value will change in the subsequent releases of ICU * 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 * This value will change in the subsequent releases of ICU
* @stable ICU 2.6 * @stable ICU 2.6
*/ */
-#define U_ICU_VERSION_SUFFIX _54 -#define U_ICU_VERSION_SUFFIX _55
+#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor +#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor
+#define ___icu_version_glue(major, minor) ___icu_version_expand(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) +#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 * This value will change in the subsequent releases of ICU
* @stable ICU 2.6 * @stable ICU 2.6
*/ */
-#define U_ICU_VERSION_SHORT "54" -#define U_ICU_VERSION_SHORT "55"
+#define U_ICU_VERSION_SHORT "54_1" +#define U_ICU_VERSION_SHORT "55_1"
#ifndef U_HIDE_INTERNAL_API #ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C. /** Data version in ICU4C.
@ -206,7 +206,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp
=================================================================== ===================================================================
--- icu.orig/source/tools/pkgdata/pkgdata.cpp --- icu.orig/source/tools/pkgdata/pkgdata.cpp
+++ icu/source/tools/pkgdata/pkgdata.cpp +++ icu/source/tools/pkgdata/pkgdata.cpp
@@ -1346,7 +1346,7 @@ static int32_t pkg_generateLibraryFile(c @@ -1356,7 +1356,7 @@ static int32_t pkg_generateLibraryFile(c
length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) + length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) +
((uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP])) * 2) + ((uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP])) * 2) +
uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) + uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) +
@ -215,7 +215,7 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp
uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE; uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE;
#if U_PLATFORM == U_PF_CYGWIN #if U_PLATFORM == U_PF_CYGWIN
length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]); length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]);
@@ -1393,7 +1393,7 @@ static int32_t pkg_generateLibraryFile(c @@ -1403,7 +1403,7 @@ static int32_t pkg_generateLibraryFile(c
#endif #endif
objectFile, objectFile,
pkgDataFlags[LD_SONAME], pkgDataFlags[LD_SONAME],

18
icu.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Apr 28 19:02:39 UTC 2015 - tchvatal@suse.com
- Update baselibs.conf
-------------------------------------------------------------------
Tue Apr 28 10:56:53 UTC 2015 - tchvatal@suse.com
- Version bump to latest release 55.1:
* support of CLDR 27 (with a major cleanup of region locales, among many
other improvements), formatting for scientific notation ("1.2 × 10³")
* update to Unicode 7.0 data for spoof-checking
* Various performance enhancements
* Full upstream changelog:
http://site.icu-project.org/download/55
- Refresh the soname versioning patch:
* icu-versioning.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 11 15:55:39 UTC 2014 - jengelh@inai.de Sat Oct 11 15:55:39 UTC 2014 - jengelh@inai.de

46
icu.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package icu # spec file for package icu
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,20 +16,23 @@
# #
%define lname libicu54_1 %define lname libicu55_1
%define amajor 54 %define amajor 55
%define aversion 54_1 %define aversion 55_1
%ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
%define be_platform 1
%else
%define be_platform 0
%endif
Name: icu Name: icu
Version: 54.1 Version: 55.1
Release: 0 Release: 0
Summary: International Components for Unicode Summary: International Components for Unicode
License: MIT License: MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://icu-project.org/ Url: http://icu-project.org/
Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz
Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip
Source3: sanitize_docs.sh
Source100: baselibs.conf Source100: baselibs.conf
Patch2: icu-remove-datetime.patch Patch2: icu-remove-datetime.patch
Patch3: icu-versioning.diff Patch3: icu-versioning.diff
@ -40,11 +43,6 @@ BuildRequires: gcc-c++
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: unzip BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifarch %armb hppa mips mips64 ppc ppc64 %sparc s390 s390x m68k
%define be_platform 1
%else
%define be_platform 0
%endif
%description %description
ICU is a set of C and C++ libraries that provides robust and ICU is a set of C and C++ libraries that provides robust and
@ -60,15 +58,15 @@ This subpackage contains the runtime programs for interacting with ICU.
%package -n %lname %package -n %lname
Summary: International Components for Unicode Summary: International Components for Unicode
Group: System/Libraries Group: System/Libraries
%if %be_platform
Requires: libicu%{aversion}-bedata
%else
Requires: libicu%{aversion}-ledata
%endif
Requires: timezone Requires: timezone
# Following O/P added in timeframe for 12.2 # Following O/P added in timeframe for 12.2
Provides: libicu = %version Provides: libicu = %version
Obsoletes: libicu < %version Obsoletes: libicu < %version
%if %be_platform
Requires: libicu%aversion-bedata = %version
%else
Requires: libicu%aversion-ledata = %version
%endif
%description -n %lname %description -n %lname
ICU is a set of C and C++ libraries that provides robust and ICU is a set of C and C++ libraries that provides robust and
@ -83,8 +81,8 @@ BuildArch: noarch
%endif %endif
%if %be_platform %if %be_platform
# Added for 13.2 # Added for 13.2
Obsoletes: libicu%aversion-data Obsoletes: libicu%aversion-data < %version
Provides: libicu%aversion-data Provides: libicu%aversion-data = %version
%endif %endif
%description -n libicu%aversion-bedata %description -n libicu%aversion-bedata
@ -105,8 +103,8 @@ BuildArch: noarch
%endif %endif
%if !%be_platform %if !%be_platform
# Added for 13.2 # Added for 13.2
Obsoletes: libicu%aversion-data Obsoletes: libicu%aversion-data < %version
Provides: libicu%aversion-data Provides: libicu%aversion-data = %version
%endif %endif
%description -n libicu%aversion-ledata %description -n libicu%aversion-ledata
@ -190,7 +188,7 @@ cp -a license.html readme.html "%buildroot/%_docdir/%name/"
find . -name CVS -type d -exec rm -Rf "{}" "+" find . -name CVS -type d -exec rm -Rf "{}" "+"
cd source cd source
make install DESTDIR="%buildroot" make DESTDIR=%buildroot install %{?_smp_mflags}
cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/" cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/"
# #
@ -282,13 +280,13 @@ fi;
%defattr(-, root, root) %defattr(-, root, root)
%_libdir/libicu*.so.* %_libdir/libicu*.so.*
%files -n libicu%{aversion}-bedata %files -n libicu%aversion-bedata
%defattr(-,root,root) %defattr(-,root,root)
%dir %_datadir/icu %dir %_datadir/icu
%dir %_datadir/icu/%version %dir %_datadir/icu/%version
%_datadir/icu/%version/icudt%{amajor}b.dat %_datadir/icu/%version/icudt%{amajor}b.dat
%files -n libicu%{aversion}-ledata %files -n libicu%aversion-ledata
%defattr(-,root,root) %defattr(-,root,root)
%dir %_datadir/icu %dir %_datadir/icu
%dir %_datadir/icu/%version %dir %_datadir/icu/%version

3
icu4c-54_1-docs.zip
View File

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

3
icu4c-54_1-src.tgz
View File

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

3
icu4c-55_1-docs.zip Normal file
View File

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

3
icu4c-55_1-src.tgz Normal file
View File

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

15
sanitize_docs.sh
View File

@ -1,15 +0,0 @@
#!/bin/sh -ex
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"
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 -Rf html