Accepting request 515203 from X11:common:Factory
Needed for glibc-2.26 to progress, please evaluate in Staging:C. Jan added the patch name of all changed patches. OBS-URL: https://build.opensuse.org/request/show/515203 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
27b989e4be
@ -1,6 +1,12 @@
|
||||
--- source/i18n/precision.cpp.orig 2017-05-17 11:05:56.517416029 +0000
|
||||
+++ source/i18n/precision.cpp 2017-05-17 11:05:22.700828110 +0000
|
||||
@@ -227,7 +227,7 @@
|
||||
---
|
||||
source/i18n/precision.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: icu/source/i18n/precision.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/i18n/precision.cpp
|
||||
+++ icu/source/i18n/precision.cpp
|
||||
@@ -227,7 +227,7 @@ FixedPrecision::initVisibleDigits(
|
||||
}
|
||||
// Try to find n such that value * 10^n is an integer
|
||||
int32_t n = -1;
|
||||
|
||||
10
icu.changes
10
icu.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 2 20:16:08 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- refresh icu-avoid-x87-excess-precision.diff with p1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 5 10:08:40 UTC 2017 - schwab@suse.de
|
||||
|
||||
- xlocale.patch: don't use obsolete <xlocale.h>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 17 11:14:47 UTC 2017 - rguenther@suse.com
|
||||
|
||||
|
||||
86
icu.spec
86
icu.spec
@ -38,6 +38,7 @@ Patch3: icu-versioning.diff
|
||||
Patch4: icu-fix-install-mode-files.diff
|
||||
Patch6: icu-error-reporting.diff
|
||||
Patch7: icu-avoid-x87-excess-precision.diff
|
||||
Patch8: xlocale.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkg-config
|
||||
@ -45,13 +46,12 @@ BuildRequires: unzip
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
ICU is a set of C and C++ libraries that provides robust and
|
||||
full-featured Unicode and locale support. The library provides calendar
|
||||
support, conversions for many character sets, language 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, etc.
|
||||
ICU is a set of C and C++ libraries that provide extensive Unicode and locale
|
||||
support, such as calendar, conversions for many character sets, language
|
||||
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.
|
||||
|
||||
@ -69,9 +69,9 @@ Requires: libicu%aversion-ledata = %version
|
||||
%endif
|
||||
|
||||
%description -n %lname
|
||||
ICU is a set of C and C++ libraries that provides robust and
|
||||
full-featured Unicode support. This package contains the runtime
|
||||
libraries for ICU which include precompiled locale data.
|
||||
ICU is a set of C and C++ libraries that provide extensive Unicode
|
||||
and locale support.
|
||||
This package contains the runtime libraries for ICU.
|
||||
|
||||
%package -n libicu%aversion-bedata
|
||||
Summary: Rule databases and tables for ICU
|
||||
@ -86,8 +86,8 @@ Provides: libicu%aversion-data = %version
|
||||
%endif
|
||||
|
||||
%description -n libicu%aversion-bedata
|
||||
ICU is a set of C and C++ libraries that provides robust and
|
||||
full-featured Unicode support.
|
||||
ICU is a set of C and C++ libraries that provide extensive Unicode
|
||||
and locale support.
|
||||
|
||||
ICU makes use of a wide variety of data tables to provide many of its
|
||||
services: converter mapping tables, collation rules, transliteration
|
||||
@ -108,8 +108,8 @@ Provides: libicu%aversion-data = %version
|
||||
%endif
|
||||
|
||||
%description -n libicu%aversion-ledata
|
||||
ICU is a set of C and C++ libraries that provides robust and
|
||||
full-featured Unicode support.
|
||||
ICU is a set of C and C++ libraries that provide extensive Unicode
|
||||
and locale support.
|
||||
|
||||
ICU makes use of a wide variety of data tables to provide many of its
|
||||
services: converter mapping tables, collation rules, transliteration
|
||||
@ -118,21 +118,23 @@ rules, break iterator rules and dictionaries.
|
||||
This subpackage contains these data tables, in little-endian format.
|
||||
|
||||
%package -n libicu-devel
|
||||
Summary: International Components for Unicode (development files)
|
||||
Summary: Development files for the ICU library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %lname = %version
|
||||
|
||||
%description -n libicu-devel
|
||||
ICU is a C++ and C library that provides robust and full-featured
|
||||
Unicode support. This package contains the development files for ICU.
|
||||
ICU is a set of C and C++ libraries that provide extensive Unicode
|
||||
and locale support.
|
||||
This package contains the headers for ICU.
|
||||
|
||||
%package -n libicu-doc
|
||||
Summary: International Components for Unicode (HTML documentation)
|
||||
Summary: Documentation for the ICU library
|
||||
Group: Documentation/HTML
|
||||
|
||||
%description -n libicu-doc
|
||||
ICU is a C++ and C library that provides robust and full-featured
|
||||
Unicode support. This package contains the HTML documentation.
|
||||
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)
|
||||
@ -140,25 +142,22 @@ Group: Development/Sources
|
||||
Requires: %lname >= %version
|
||||
|
||||
%description data
|
||||
ICU is a C++ and C library that provides robust and full-featured
|
||||
Unicode support. This package contains the source files for the data
|
||||
found in the "icu" package.
|
||||
ICU is a set of C and C++ libraries that provide extensive Unicode
|
||||
and locale support.
|
||||
|
||||
This data describes the Unicode data (normative and informative) and
|
||||
also all the table-based converters provided in the ICU distribution.
|
||||
|
||||
This package contains uncompiled source data.
|
||||
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
|
||||
# docs are special
|
||||
mkdir html
|
||||
cd html
|
||||
pushd html/
|
||||
unzip %SOURCE2
|
||||
cd ..
|
||||
|
||||
%patch -P 3 -P 4 -P 6 -p1
|
||||
%patch7
|
||||
popd
|
||||
|
||||
%build
|
||||
cd source
|
||||
@ -194,7 +193,7 @@ cp data/out/icudt*.dat "%buildroot/%_datadir/icu/%version/"
|
||||
|
||||
#
|
||||
# ICU's "pkgdata" utility is really fragile, so icu-versioning.diff
|
||||
# does as few as possible, but that means we need some additional
|
||||
# does as few actions as possible, but that means we need some additional
|
||||
# cleanup in the spec file now.
|
||||
#
|
||||
pushd "%buildroot/%_libdir/"
|
||||
@ -238,25 +237,24 @@ ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE=
|
||||
# the (main) package in this case
|
||||
if test -d "%_libdir/icu"; then
|
||||
current=$(cd "%_libdir/icu/"; find [0-9]* -maxdepth 1 -type d -printf '%%f\n' |
|
||||
sort -V | tail -n1);
|
||||
sort -V | tail -n1)
|
||||
if test -n "$current"; then
|
||||
rm -f "%_libdir/icu/current";
|
||||
ln -sv "$current" "%_libdir/icu/current";
|
||||
fi;
|
||||
fi;
|
||||
rm -f "%_libdir/icu/current"
|
||||
ln -sv "$current" "%_libdir/icu/current"
|
||||
fi
|
||||
fi
|
||||
|
||||
%postun
|
||||
if test -d "%_libdir/icu"; then
|
||||
current=$(cd "%_libdir/icu/"; find [0-9]* -maxdepth 1 -type d -printf '%%f\n' |
|
||||
sort -V | tail -n1);
|
||||
sort -V | tail -n1)
|
||||
if test -n "$current"; then
|
||||
rm -f "%_libdir/icu/current";
|
||||
ln -sv "$current" "%_libdir/icu/current";
|
||||
fi;
|
||||
fi;
|
||||
rm -f "%_libdir/icu/current"
|
||||
ln -sv "$current" "%_libdir/icu/current"
|
||||
fi
|
||||
fi
|
||||
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
|
||||
26
xlocale.patch
Normal file
26
xlocale.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From: Andrews Schwab <schwab@suse.de>
|
||||
Date: Mon, 31 Jul 2017 12:19:40 +0000
|
||||
|
||||
don't use obsolete <xlocale.h>
|
||||
|
||||
---
|
||||
source/i18n/digitlst.cpp | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
Index: icu/source/i18n/digitlst.cpp
|
||||
===================================================================
|
||||
--- icu.orig/source/i18n/digitlst.cpp
|
||||
+++ icu/source/i18n/digitlst.cpp
|
||||
@@ -61,11 +61,7 @@
|
||||
#endif
|
||||
|
||||
#if U_USE_STRTOD_L
|
||||
-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
|
||||
-# include <locale.h>
|
||||
-# else
|
||||
-# include <xlocale.h>
|
||||
-# endif
|
||||
+# include <locale.h>
|
||||
#endif
|
||||
|
||||
// ***************************************************************************
|
||||
Loading…
Reference in New Issue
Block a user