From d0a3cde39d1121e9cf8de0f8b7f0d96a5f0eb44b34780916f04091ea3c859436 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 27 Mar 2013 00:04:24 +0000 Subject: [PATCH 1/4] icu4c-51.1 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=20 --- download.sh | 13 ++++++++++ icu.changes | 17 +++++++++++++ icu.spec | 54 ++++++++++++++++++++++++------------------ icu4c-50_1_2-docs.zip | 3 --- icu4c-50_1_2-src.tgz | 3 --- icu4c-51_1-docs.tar.xz | 3 +++ icu4c-51_1-src.tar.xz | 3 +++ 7 files changed, 67 insertions(+), 29 deletions(-) create mode 100644 download.sh delete mode 100644 icu4c-50_1_2-docs.zip delete mode 100644 icu4c-50_1_2-src.tgz create mode 100644 icu4c-51_1-docs.tar.xz create mode 100644 icu4c-51_1-src.tar.xz diff --git a/download.sh b/download.sh new file mode 100644 index 0000000..196cf3e --- /dev/null +++ b/download.sh @@ -0,0 +1,13 @@ +#!/bin/sh -ex + +ver="51.1" +name="icu4c-51_1-docs.zip" +wget -c "http://download.icu-project.org/files/icu4c/$ver/$name" +rm -Rf html +mkdir html +pushd html +unzip "../$name" +popd +tar --use=xz -cvf "${name%.zip}.tar.xz" html +rm "$name" +rm -Rf html diff --git a/icu.changes b/icu.changes index af99052..d9aab1a 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Mar 26 15:05:41 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 51 +* Collation tailorings put native script first; + non-Gregorian calendar formats are more consistent; +* Date format/parse now supports CLDR short weekday names +* Support DisplayContext for date formatting, locale display names +* Support new timezone pattern characters in LDML spec +* Support for “dangi” Korean luni-solar calendar +* Add CompactDecimalFormat and TerritoryContainment APIs +* ICU50 regression fix: Affixes set with e.g. + DecimalFormat::setPositivePrefix were ignored for parse +* ICU50 regression fix: UNUM_PARSE_INT_ONLY no longer handled + grouping separator +- Recompress to xz to save space + ------------------------------------------------------------------- Fri Jan 25 09:26:17 UTC 2013 - cfarrell@suse.com diff --git a/icu.spec b/icu.spec index f122237..ad6d89b 100644 --- a/icu.spec +++ b/icu.spec @@ -17,21 +17,24 @@ Name: icu -%define lname libicu50 -Version: 50.1.2 +%define lname libicu51 +Version: 51.1 Release: 0 -%define aversion 50_1_2 +%define aversion 51_1 Summary: International Components for Unicode License: X11 Group: System/Libraries Url: http://ibm.com/software/globalization/icu -Source0: http://download.icu-project.org/files/icu4c/%{version}/icu4c-%{aversion}-src.tgz -Source1: http://download.icu-project.org/files/icu4c/%{version}/icu4c-%{aversion}-docs.zip + +#DL-URL: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz +Source: icu4c-%aversion-src.tar.xz +Source2: icu4c-%aversion-docs.tar.xz +Source3: download.sh # PATCH-FIX-UPSTREAM icu-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808 Patch1: icu-rpmlint.diff # PATCH-FIX-OPENSUSE icu-remove-datetime.patch vuntz@novell.com -- Do not put date/time in icu-config (needed for build-compare) Patch99: icu-remove-datetime.patch -#BuildRequires: automake +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: unzip @@ -113,11 +116,7 @@ This package contains uncompiled source data. Precompiled data is in the "%lname" package. %prep -%setup -q -n icu -mkdir html -pushd html -unzip -qq %{S:1} -popd +%setup -qn icu -a2 %patch1 -p1 %patch99 -p1 @@ -131,21 +130,28 @@ export CFLAGS="$CXXFLAGS" make %{?_smp_mflags} %install +b="%buildroot" +mkdir -p "$b/%_docdir/%name" +cp -a html "$b/%_docdir/%name/" +cp -a license.html readme.html "$b/%_docdir/%name/" + find . -name CVS -type d -exec rm -Rf "{}" "+" cd source -make install DESTDIR="%buildroot"; +make install DESTDIR="$b"; -# to extract debug info -chmod a+rx "%buildroot/%_libdir"/*.so.* +# /usr/lib/rpm/elfdeps requires +x bit +chmod a+rx "$b/%_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 "$b/%_datadir/icu/%version/unidata" +install -m 644 data/unidata/*.txt "$b/%_datadir/icu/%version/unidata" +ln -s unidata/UnicodeData.txt "$b/%_datadir/icu/%version/" -rm "%buildroot/%_datadir/icu/%version/license.html" -rm "%buildroot/%_datadir/icu/%version/install-sh" +rm "$b/%_datadir/icu/%version/license.html" +rm "$b/%_datadir/icu/%version/install-sh" + +%fdupes %buildroot/%_prefix %check cd source @@ -178,13 +184,11 @@ if test -d "%_libdir/icu"; then fi; fi; -%post -n %lname -p /sbin/ldconfig - +%post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) -%doc license.html readme.html %dir %_libdir/icu %dir %_libdir/icu/%version %_libdir/icu/current @@ -196,6 +200,9 @@ fi; %_bindir/uconv %_sbindir/* %_mandir/*/* +%dir %_docdir/%name +%_docdir/%name/license.html +%_docdir/%name/readme.html %files -n %lname %defattr(-, root, root) @@ -219,7 +226,8 @@ fi; %files -n libicu-doc %defattr(-,root,root) -%doc html/ +%dir %_docdir/%name +%_docdir/%name/html %files data %defattr(-, root, root) diff --git a/icu4c-50_1_2-docs.zip b/icu4c-50_1_2-docs.zip deleted file mode 100644 index f022367..0000000 --- a/icu4c-50_1_2-docs.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a2c78d4ee41a659eca1c2dad6cddd03f6ab36d35b332960193647e0ff94964d -size 6134640 diff --git a/icu4c-50_1_2-src.tgz b/icu4c-50_1_2-src.tgz deleted file mode 100644 index 86e3b81..0000000 --- a/icu4c-50_1_2-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb68067dcc60d682f8e037bf0961bdd5169cb4652ef8aa136e893780047dafd3 -size 21189361 diff --git a/icu4c-51_1-docs.tar.xz b/icu4c-51_1-docs.tar.xz new file mode 100644 index 0000000..fab00f7 --- /dev/null +++ b/icu4c-51_1-docs.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a57d4a10421e9ed24aed657bd430174986b85fe0e4d6df9068eaed184e7102 +size 2587952 diff --git a/icu4c-51_1-src.tar.xz b/icu4c-51_1-src.tar.xz new file mode 100644 index 0000000..c3e3470 --- /dev/null +++ b/icu4c-51_1-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20ac1bb25a1b4c214bd551d0bd00801952bbba2ad3b01dd1392ebcc72a07f435 +size 11994208 From 67335560541e28c0190b0d9df20ed9d36a4d198242801f938ccdb32c37a9344e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 27 Mar 2013 00:22:10 +0000 Subject: [PATCH 2/4] BuildRequires: xz OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=21 --- icu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu.spec b/icu.spec index ad6d89b..4988a56 100644 --- a/icu.spec +++ b/icu.spec @@ -37,7 +37,7 @@ Patch99: icu-remove-datetime.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRequires: unzip +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From a252e3a1ac046528a8b9102f8db7178173316026ec969530ee5c2695cc46ce5c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 27 Mar 2013 00:22:29 +0000 Subject: [PATCH 3/4] Adjust baselibs too OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=22 --- baselibs.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index c2ddf57..af99ccd 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libicu50 +libicu51 libicu-devel requires -libicu- - requires "libicu50- = " + requires "libicu51- = " From d4e69c989425742c5c91d885666cffaf4629f645b182bd1fba16dbaa6d615c72 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 6 May 2013 08:15:27 +0000 Subject: [PATCH 4/4] RPM metadata update OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=23 --- icu.changes | 5 +++++ icu.spec | 36 +++++++++++++++--------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/icu.changes b/icu.changes index d9aab1a..558b0a2 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 6 07:51:07 UTC 2013 - jengelh@inai.de + +- Update RPM group, description, URL + ------------------------------------------------------------------- Tue Mar 26 15:05:41 UTC 2013 - jengelh@inai.de diff --git a/icu.spec b/icu.spec index 4988a56..089cbfb 100644 --- a/icu.spec +++ b/icu.spec @@ -23,8 +23,8 @@ Release: 0 %define aversion 51_1 Summary: International Components for Unicode License: X11 -Group: System/Libraries -Url: http://ibm.com/software/globalization/icu +Group: Development/Libraries/C and C++ +Url: http://icu-project.org/ #DL-URL: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz Source: icu4c-%aversion-src.tar.xz @@ -49,12 +49,7 @@ catalogs and resources, message formatting, normalization, number and currency formatting, time zone support, transliteration, and word, line, and sentence breaking, etc. -This package contains the Unicode character database and derived -properties along with converters and time zone data. - -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. +This subpackage contains the runtime programs for interacting with ICU. %package -n %lname # Splitting this package is of no significant benefit: @@ -74,8 +69,7 @@ Obsoletes: libicu < %version-%release %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. It does not contain any of the data files needed at -runtime and present in the `icu' and `icu-locales` packages. +libraries for ICU which include precompiled locale data. %package -n libicu-devel Summary: International Components for Unicode (development files) @@ -140,8 +134,8 @@ cd source make install DESTDIR="$b"; -# /usr/lib/rpm/elfdeps requires +x bit -chmod a+rx "$b/%_libdir"/*.so.* +# /usr/lib/rpm/elfdeps requires +x bit and not all had it at one point +chmod a+rx "$b/%_libdir"/lib*.so.* # install uncompiled source data: mkdir -p "$b/%_datadir/icu/%version/unidata" @@ -166,7 +160,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"; @@ -176,7 +170,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"; @@ -199,8 +193,8 @@ fi; %_bindir/pkgdata %_bindir/uconv %_sbindir/* -%_mandir/*/* -%dir %_docdir/%name +%_mandir/man*/* +%dir %_docdir/%name/ %_docdir/%name/license.html %_docdir/%name/readme.html @@ -217,17 +211,17 @@ fi; %_libdir/icu/%version/pkgdata.inc %_libdir/icu/Makefile.inc %_libdir/icu/pkgdata.inc -%_libdir/pkgconfig/*.pc +%_libdir/pkgconfig/icu-*.pc %_bindir/icu-config -%dir %_datadir/icu -%dir %_datadir/icu/%version +%dir %_datadir/icu/ +%dir %_datadir/icu/%version/ %_datadir/icu/%version/mkinstalldirs %_datadir/icu/%version/config/ %files -n libicu-doc %defattr(-,root,root) -%dir %_docdir/%name -%_docdir/%name/html +%dir %_docdir/%name/ +%_docdir/%name/html/ %files data %defattr(-, root, root)