From 0805b499747afb2ee75292d74f92a8390bdbbb0f8e78f24667e71ca5dc58383d Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 5 May 2011 13:49:44 +0000 Subject: [PATCH] Accepting request 69682 from GNOME:Factory Resubmit - Stale sources cleaned up. OBS-URL: https://build.opensuse.org/request/show/69682 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=22 --- icu-remove-datetime.patch | 6 ++--- icu.changes | 54 +++++++++++++++++++++++++++++++++++++++ icu.spec | 44 ++++++------------------------- icu44-rpmlint.diff | 19 -------------- icu4c-4_4_2-docs.tar.bz2 | 3 --- icu4c-4_4_2-src.tar.bz2 | 3 --- icu4c-4_6_1-docs.tar.bz2 | 3 +++ icu4c-4_6_1-src.tar.bz2 | 3 +++ 8 files changed, 71 insertions(+), 64 deletions(-) delete mode 100644 icu4c-4_4_2-docs.tar.bz2 delete mode 100644 icu4c-4_4_2-src.tar.bz2 create mode 100644 icu4c-4_6_1-docs.tar.bz2 create mode 100644 icu4c-4_6_1-src.tar.bz2 diff --git a/icu-remove-datetime.patch b/icu-remove-datetime.patch index 42b60b5..ab80fc9 100644 --- a/icu-remove-datetime.patch +++ b/icu-remove-datetime.patch @@ -6,9 +6,9 @@ Index: icu/source/Makefile.in =================================================================== --- icu.orig/source/Makefile.in +++ icu/source/Makefile.in -@@ -222,7 +222,6 @@ $(top_builddir)/config/icu-config: $(top - sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@ - sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@ +@@ -286,7 +286,6 @@ $(top_builddir)/config/icu-config: $(top + LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@ + LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@ cat $(top_srcdir)/config/icu-config-bottom >> $@ - echo "# Rebuilt on "`date` >> $@ chmod u-w $@ diff --git a/icu.changes b/icu.changes index 2ada875..3309c9f 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Thu May 5 10:21:40 CEST 2011 - vuntz@opensuse.org + +- Update to version 4.6.1: + + Common Locale Data Repository (CLDR) 1.9.1 + + Update timezone data support to Olson 2011c + + Fix: UCOL_RUNTIME_VERSION should be updated for 4.6 + + Fix: Collation Reordering Use Of USCRIPT_UNKNOWN + + Fix: Can't find Hangul with search coll (usearch doesn't handle + CE iter behavior) + + Fix: ULocale#toLanguageTag() should not supply "und" as + language when the locale has only private use + + Fix: USpoof uses NFKD, should be NFD + + ICU4C-specific bug fixes, including: + - ICU misparses numbers in scientific notation + - detect out of memory issue for Hashtable in low memory + situations +- Changes from version 4.6.0: + + Unicode 6.0: + - Supports final version of Unicode 6.0 + - New UCA data for collation/sorting, with refinements from + CLDR; this data is revamped for more effective use of + collation weights, and noncharacters are now handled + - Support for 2,088 new characters, including the new emoji and + Indian Rupee sign + - Fully updated properties + + CLDR 1.9: + - Supports final version of CLDR 1.9 + - The CLDR release contains numerous improvements and bug fixes + approved by the CLDR committee, mainly in the areas of + collation sequences, transliteration, and available date + formats. + + Support for UTS #46 Unicode IDNA Compatibility Processing. + + Alternate number symbols based on numbering system. + + Compact collation tailoring syntax for reduced memory and disk + footprint. + + New collation [import] rule for reduced footprint and improved + maintenance. + + Fast string BiDi direction detection. + + ICU4C-specific changes: + - ICU 4.6 requires compiler RTTI to be turned on. Please see + the ICU4C readme for more details. + - pkg-config files for a standard way of linking against ICU. + - Promotion to @draft (from @internal) for most regex functions + that provide access via UText. + - Regex support for a "find progress" callback. + - Enhance regex APIs to support full 64-bit offsets and + indices. + - New regex API to set match and start position independently. +- Update icu-remove-datetime.patch to apply without fuzz. +- Rebase icu44-rpmlint.diff. +- Add pkg-config BuildRequires to automatically get + pkgconfig()-style Provides. + ------------------------------------------------------------------- Fri Jan 14 14:07:54 CET 2011 - vuntz@opensuse.org diff --git a/icu.spec b/icu.spec index 2a17f8f..1ca4626 100644 --- a/icu.spec +++ b/icu.spec @@ -19,15 +19,14 @@ Name: icu -BuildRequires: gcc-c++ License: IBM PL Group: System/Libraries -Version: 4.4.2 +Version: 4.6.1 Release: 1 -Requires: libicu = %{version} +Summary: International Components for Unicode Url: http://ibm.com/software/globalization/icu -Source0: icu4c-4_4_2-src.tar.bz2 -Source1: icu4c-4_4_2-docs.tar.bz2 +Source0: icu4c-4_6_1-src.tar.bz2 +Source1: icu4c-4_6_1-docs.tar.bz2 Source3: SuSEconfig.icu # PATCH-FIX-UPSTREAM pkgdata.diff -- http://bugs.icu-project.org/trac/ticket/6969#comment:19 Patch0: pkgdata.diff @@ -35,8 +34,10 @@ Patch0: pkgdata.diff Patch1: icu44-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: gcc-c++ +BuildRequires: pkg-config +Requires: libicu = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: International Components for Unicode %description ICU is a set of C and C++ libraries that provides robust and @@ -54,12 +55,6 @@ 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. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %package -n libicu License: IBM PL Summary: International Components for Unicode (development files) @@ -79,12 +74,6 @@ 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. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %package -n libicu-devel License: IBM PL Summary: International Components for Unicode (development files) @@ -100,12 +89,6 @@ Requires: libicu = %{version} ICU is a C++ and C library that provides robust and full-featured Unicode support. This package contains the development files for ICU. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %package -n libicu-doc License: IBM PL Summary: International Components for Unicode (html documentation) @@ -115,12 +98,6 @@ Group: Development/Libraries/C and C++ ICU is a C++ and C library that provides robust and full-featured Unicode support. This package contains the html documentation. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %package -n icu-data License: IBM PL Summary: International Components for Unicode (Sources for the Data in ICU) @@ -138,12 +115,6 @@ also all the table-based converters provided in the ICU distribution. This package contains uncompiled source data. Precompiled data is in the `libicu%{version}' package. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %prep %setup -q -n icu -a1 %patch0 -p0 @@ -224,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT %{_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} diff --git a/icu44-rpmlint.diff b/icu44-rpmlint.diff index 76f5138..f3f42ce 100644 --- a/icu44-rpmlint.diff +++ b/icu44-rpmlint.diff @@ -1,31 +1,12 @@ - -I: There are likely swapped arguments in a memset - Check that the function arguments match: memset(ptr,BYTEVALUE,LENGTH) -W: icu memset-with-zero-length decnumstr.cpp:73:58 - I: Statement might be overflowing a buffer in strncat. Common mistake: BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) E: icu bufferoverflowstrncat pkgdata.cpp:299:87 --- - source/i18n/decnumstr.cpp | 2 +- source/tools/pkgdata/pkgdata.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: icu/source/i18n/decnumstr.cpp -=================================================================== ---- icu.orig/source/i18n/decnumstr.cpp -+++ icu/source/i18n/decnumstr.cpp -@@ -70,7 +70,7 @@ void DecimalNumberString::setLength(int3 - return; - } - if (length > fLength) { -- uprv_memset(&fText[fLength], length - fLength, 0); -+ uprv_memset(&fText[fLength], 0, length - fLength); - } - fLength = length; - fText[fLength] = 0; Index: icu/source/tools/pkgdata/pkgdata.cpp =================================================================== --- icu.orig/source/tools/pkgdata/pkgdata.cpp diff --git a/icu4c-4_4_2-docs.tar.bz2 b/icu4c-4_4_2-docs.tar.bz2 deleted file mode 100644 index 541e8e2..0000000 --- a/icu4c-4_4_2-docs.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:075def75cb9aaffc58f50df2af09fd5070aaff2b6f55af66064b7f3d0806dc7a -size 2405094 diff --git a/icu4c-4_4_2-src.tar.bz2 b/icu4c-4_4_2-src.tar.bz2 deleted file mode 100644 index afd5728..0000000 --- a/icu4c-4_4_2-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3dd0a651b0b4b0e3e91a6c541d694d9a5e3c8fa0d9abb508bedd617d94d5deca -size 13433336 diff --git a/icu4c-4_6_1-docs.tar.bz2 b/icu4c-4_6_1-docs.tar.bz2 new file mode 100644 index 0000000..34787f3 --- /dev/null +++ b/icu4c-4_6_1-docs.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e36cb6ead2205838252802477426a2a6fe57414831d249cf68e9c730e7091e24 +size 2963568 diff --git a/icu4c-4_6_1-src.tar.bz2 b/icu4c-4_6_1-src.tar.bz2 new file mode 100644 index 0000000..bdb4b25 --- /dev/null +++ b/icu4c-4_6_1-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:510d059064a856af2530d0c832dbfc3014085f5df00a268b5ff3c1c6d20651f4 +size 12983674