diff --git a/baselibs.conf b/baselibs.conf index 3e37929..c2ddf57 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,18 +1,4 @@ -libicudata49 -libicui18n49 -libicuio49 -libicule49 -libiculx49 -libicutest49 -libicutu49 -libicuuc49 +libicu50 libicu-devel requires -libicu- - requires "libicudata49- = " - requires "libicuio49- = " - requires "libicui18n49- = " - requires "libicule49- = " - requires "libiculx49- = " - requires "libicutest49- = " - requires "libicutu49- = " - requires "libicuuc49- = " + requires "libicu50- = " diff --git a/icu.changes b/icu.changes index ed947bf..8694368 100644 --- a/icu.changes +++ b/icu.changes @@ -1,9 +1,17 @@ ------------------------------------------------------------------- Wed Nov 14 18:09:09 UTC 2012 - jengelh@inai.de -- Split up libicu*, seeing if systems can do without libicudata. - Enabled -DU_TRACE_DYLOAD because there is some dlopening going on - that may not be reflected in dependencies yet. +- Update to new upstream release 50 +* Unicode 6.2: Turkish Lira Sign, improved word & line segmentation + (BreakIterator) for symbols +* CLDR 22.1: Data coverage & quality improved across all major + languages; new short width type for weekday names; new zhuyin + (Bopomofo) collation for Chinese; improved data for + CompactDecimalFormat & RBNF +* Time zone data: 2012h +* Ordinal-number support in MessageFormat & PluralRules +* Deprecate setLocale(locale) in PluralFormat +* Dictionary-based break iterators (word segmentation) ------------------------------------------------------------------- Wed Jul 11 21:35:12 UTC 2012 - jengelh@inai.de diff --git a/icu.spec b/icu.spec index 849f0b7..2dd573c 100644 --- a/icu.spec +++ b/icu.spec @@ -17,15 +17,15 @@ Name: icu -%define sover 49 -Version: 49.1 +%define lname libicu50 +Version: 50.1 Release: 0 -%define aversion 49_1 +%define aversion 50_1 Summary: International Components for Unicode License: SUSE-XFree86-1.0 Group: System/Libraries Url: http://ibm.com/software/globalization/icu -Source0: icu4c-%aversion-src.tgz +Source0: icu4c-%aversion-src.tar.xz Source1: icu4c-%aversion-docs.zip # PATCH-FIX-UPSTREAM icu-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808 Patch1: icu-rpmlint.diff @@ -35,6 +35,7 @@ Patch99: icu-remove-datetime.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: unzip +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,106 +54,26 @@ This package contains the runtime libraries for ICU. It does not contain any of the data files needed at runtime and present in the icu and icu-locales packages. -%package -n libicudata%sover -Summary: International Components for Unicode: Data library -Group: System/Libraries -Obsoletes: icu-i18ndata - -%description -n libicudata%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -icudata contains data required by the common and i18n ICU libraries. - -%package -n libicui18n%sover -Summary: International Components for Unicode: Internationalization library -Group: System/Libraries - -%description -n libicui18n%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -icui18n is a library that contains many local-based -internationalization (i18n) functions. - -%package -n libicuio%sover -Summary: International Components for Unicode -Group: System/Libraries - -%description -n libicuio%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -icuio is an optional library that provides a stdio-like API with -Unicode support. - -%package -n libicule%sover -Summary: International Components for Unicode: Layout engine -Group: System/Libraries - -%description -n libicule%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -icule is an optional engine for doing font layout. - -%package -n libiculx%sover -Summary: International Components for Unicode: Layout extensions engine -Group: System/Libraries - -%description -n libiculx%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -iculx is an optional engine for doing font layout that uses parts of -ICU. - -%package -n libicutest%sover -Summary: International Components for Unicode: Testing library -Group: System/Libraries - -%description -n libicutest%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -(Upstream has not provided a description for this library.) - -%package -n libicutu%sover -Summary: International Components for Unicode: Tool utility library -Group: System/Libraries - -%description -n libicutu%sover -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -An internal library that contains internal APIs that are only used -by ICU's tools. - -%package -n libicuuc%sover -Summary: International Components for Unicode: Common library -Group: System/Libraries +%package -n %lname +# Splitting this package is of no significant benefit: +# icudata (largest part) is always needed. +Summary: International Components for Unicode (development files) +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: libicu-64bit %endif Requires: timezone +Obsoletes: icu-i18ndata # Following O/P added in timeframe for 12.2 Provides: libicu = %version-%release Obsoletes: libicu < %version-%release -%description -n libicuuc%sover +%description -n %lname ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode support. This package contains the main runtime -library for ICU. - -Base library required by all other ICU libraries. +full-featured Unicode support. This package contains the runtime +libraries for ICU. It does not contain any of the data files needed at +runtime and present in the `icu' and `icu-locales` packages. %package -n libicu-devel Summary: International Components for Unicode (development files) @@ -162,14 +83,7 @@ Group: Development/Libraries/C and C++ Obsoletes: libicu-devel-64bit %endif # -Requires: libicudata%sover = %version -Requires: libicui18n%sover = %version -Requires: libicuio%sover = %version -Requires: libicule%sover = %version -Requires: libiculx%sover = %version -Requires: libicutest%sover = %version -Requires: libicutu%sover = %version -Requires: libicuuc%sover = %version +Requires: %lname = %version %description -n libicu-devel ICU is a C++ and C library that provides robust and full-featured @@ -186,7 +100,7 @@ Unicode support. This package contains the html documentation. %package data Summary: International Components for Unicode (Sources for the Data in ICU) Group: System/Libraries -Requires: libicudata%sover >= %version +Requires: %lname >= %version %description data ICU is a C++ and C library that provides robust and full-featured @@ -197,21 +111,21 @@ 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. Precompiled data is in -the "libicudata%sover" package. +the "%lname" package. %prep %setup -q -n icu mkdir html pushd html -unzip %{SOURCE1} +unzip %{S:1} popd %patch1 -p1 %patch99 -p1 %build cd source -export CXXFLAGS="%{optflags} -DU_TRACE_DYLOAD -DICU_DATA_DIR=\\\"/usr/share/icu/%{version}/\\\""; -export CFLAGS="$CXXFLAGS"; +export CXXFLAGS="%optflags -DICU_DATA_DIR=\\\"/usr/share/icu/%version/\\\"" +export CFLAGS="$CXXFLAGS" %configure --disable-static --with-pic\ --enable-shared \ --without-samples @@ -224,18 +138,17 @@ cd source make install DESTDIR="%buildroot"; # to extract debug info -chmod a+rx %{buildroot}%{_libdir}/*.so.* +chmod a+rx "%buildroot/%_libdir"/*.so.* # install uncompiled source data: -mkdir -p %{buildroot}%{_datadir}/icu/%{version}/unidata -install -m 644 data/unidata/*.txt %{buildroot}/%{_datadir}/icu/%{version}/unidata -ln -s unidata/UnicodeData.txt %{buildroot}/%{_datadir}/icu/%{version}/ +mkdir -p "%buildroot/%_datadir/icu/%version/unidata" +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}/license.html -rm %{buildroot}/%{_datadir}/icu/%{version}/install-sh +rm "%buildroot/%_datadir/icu/%version/license.html" +rm "%buildroot/%_datadir/icu/%version/install-sh" %check -exit 0 cd source %if !0%{?qemu_user_space_build:1} # Checks disabled in qemu because of races happening when we emulate @@ -248,7 +161,7 @@ make check # the (main) package in this case %post if test -d "%_libdir/icu"; then - current=$(cd %_libdir/icu; find [0-9]* -maxdepth 1 -type d -printf '%f\n' | + current=$(cd "%_libdir/icu"; find [0-9]* -maxdepth 1 -type d -printf '%f\n' | sort -V | tail -n1); if test -n "$current"; then rm -f "%_libdir/icu/current"; @@ -258,7 +171,7 @@ fi; %postun if test -d "%_libdir/icu"; then - current=$(cd %_libdir/icu; find [0-9]* -maxdepth 1 -type d -printf '%f\n' | + current=$(cd "%_libdir/icu"; find [0-9]* -maxdepth 1 -type d -printf '%f\n' | sort -V | tail -n1); if test -n "$current"; then rm -f "%_libdir/icu/current"; @@ -266,97 +179,52 @@ if test -d "%_libdir/icu"; then fi; fi; -%post -n libicudata%sover -p /sbin/ldconfig -%postun -n libicudata%sover -p /sbin/ldconfig -%post -n libicui18n%sover -p /sbin/ldconfig -%postun -n libicui18n%sover -p /sbin/ldconfig -%post -n libicuio%sover -p /sbin/ldconfig -%postun -n libicuio%sover -p /sbin/ldconfig -%post -n libicule%sover -p /sbin/ldconfig -%postun -n libicule%sover -p /sbin/ldconfig -%post -n libiculx%sover -p /sbin/ldconfig -%postun -n libiculx%sover -p /sbin/ldconfig -%post -n libicutest%sover -p /sbin/ldconfig -%postun -n libicutest%sover -p /sbin/ldconfig -%post -n libicutu%sover -p /sbin/ldconfig -%postun -n libicutu%sover -p /sbin/ldconfig -%post -n libicuuc%sover -p /sbin/ldconfig -%postun -n libicuuc%sover -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig + +%postun -n %lname -p /sbin/ldconfig %files -%defattr(-, root, root) +%defattr(-,root,root) %doc license.html readme.html -%dir %{_libdir}/icu/ -%dir %{_libdir}/icu/%{version} -%{_libdir}/icu/current -%{_bindir}/derb -%{_bindir}/genbrk -%{_bindir}/gencfu -%{_bindir}/gencnval -%{_bindir}/genrb -%{_bindir}/genctd -%{_bindir}/icuinfo -%{_bindir}/makeconv -%{_bindir}/pkgdata -%{_bindir}/uconv -%{_sbindir}/* -%{_mandir}/*/* +%dir %_libdir/icu +%dir %_libdir/icu/%version +%_libdir/icu/current +%_bindir/derb +%_bindir/gen* +%_bindir/icuinfo +%_bindir/makeconv +%_bindir/pkgdata +%_bindir/uconv +%_sbindir/* +%_mandir/*/* -%files -n libicudata%sover -%defattr(-,root,root) -%_libdir/libicudata.so.%{sover}* - -%files -n libicui18n%sover -%defattr(-,root,root) -%_libdir/libicui18n.so.%{sover}* - -%files -n libicuio%sover -%defattr(-,root,root) -%_libdir/libicuio.so.%{sover}* - -%files -n libicule%sover -%defattr(-,root,root) -%_libdir/libicule.so.%{sover}* - -%files -n libiculx%sover -%defattr(-,root,root) -%_libdir/libiculx.so.%{sover}* - -%files -n libicutest%sover -%defattr(-,root,root) -%_libdir/libicutest.so.%{sover}* - -%files -n libicutu%sover -%defattr(-,root,root) -%_libdir/libicutu.so.%{sover}* - -%files -n libicuuc%sover -%defattr(-,root,root) -%_libdir/libicuuc.so.%{sover}* +%files -n %lname +%defattr(-, root, root) +%_libdir/libicu*.so.* %files -n libicu-devel %defattr(-, root, root) -%{_libdir}/libicu*.so -%{_includedir}/unicode/ -%{_includedir}/layout/ -%{_libdir}/icu/%{version}/Makefile.inc -%{_libdir}/icu/%{version}/pkgdata.inc -%{_libdir}/icu/Makefile.inc -%{_libdir}/icu/pkgdata.inc -%{_libdir}/pkgconfig/*.pc -%{_bindir}/icu-config -%dir %{_datadir}/icu -%dir %{_datadir}/icu/%{version} -%{_datadir}/icu/%{version}/mkinstalldirs -%{_datadir}/icu/%{version}/config/ +%_libdir/libicu*.so +%_includedir/unicode/ +%_includedir/layout/ +%_libdir/icu/%version/Makefile.inc +%_libdir/icu/%version/pkgdata.inc +%_libdir/icu/Makefile.inc +%_libdir/icu/pkgdata.inc +%_libdir/pkgconfig/*.pc +%_bindir/icu-config +%dir %_datadir/icu +%dir %_datadir/icu/%version +%_datadir/icu/%version/mkinstalldirs +%_datadir/icu/%version/config/ %files -n libicu-doc -%defattr(-, root, root) +%defattr(-,root,root) %doc html/ %files data %defattr(-, root, root) -%{_datadir}/icu/%{version}/unidata/ -%{_datadir}/icu/%{version}/UnicodeData.txt +%_datadir/icu/%version/unidata/ +%_datadir/icu/%version/UnicodeData.txt %changelog diff --git a/icu4c-49_1-docs.zip b/icu4c-49_1-docs.zip deleted file mode 100644 index 0a5aec8..0000000 --- a/icu4c-49_1-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df8e333ac3022b43d18216d52b8b8be4735e0cfc09dc81dc77b3730b864b41e2 -size 4242056 diff --git a/icu4c-49_1-src.tgz b/icu4c-49_1-src.tgz deleted file mode 100644 index faf4a57..0000000 --- a/icu4c-49_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6399f00941d982c64fef96b0094dd2f7c1421f8a0c113686d5f123daf8eabca -size 19000749 diff --git a/icu4c-50_1-docs.zip b/icu4c-50_1-docs.zip new file mode 100644 index 0000000..dfa1d40 --- /dev/null +++ b/icu4c-50_1-docs.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8116e70dddfd22435754dc5c7c883970970b56855d2b32305a9c47fbacaed1 +size 6125195 diff --git a/icu4c-50_1-src.tar.xz b/icu4c-50_1-src.tar.xz new file mode 100644 index 0000000..48f4cb6 --- /dev/null +++ b/icu4c-50_1-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3fef3aa8ff3d4c21292d2b3fc73f47dd0ea75ceda00f68a2fdd30a58e5f7bec +size 11667520