From 2d8e7a76b9f187fca7cde70ff0f0c52f2e1403115accbcd520c49839879a9c2b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 20 Nov 2012 20:06:59 +0000 Subject: [PATCH] osc copypac from project:openSUSE:Factory package:icu revision:32 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=35 --- SuSEconfig.icu | 20 -- baselibs.conf | 4 +- icu-gcc44.patch | 13 - icu-remove-datetime.patch | 16 ++ icu-rpmlint.diff | 29 ++ icu.changes | 275 +++++++++++++++++- icu.spec | 379 +++++++------------------ icu4c-3_6-src-setBreakType-public.diff | 17 -- icu4c-49_1-docs.zip | 3 + icu4c-49_1-src.tgz | 3 + icu4c-4_0-docs.tar.bz2 | 3 - icu4c-4_0-src.tar.bz2 | 3 - ready | 0 13 files changed, 438 insertions(+), 327 deletions(-) delete mode 100644 SuSEconfig.icu delete mode 100644 icu-gcc44.patch create mode 100644 icu-remove-datetime.patch create mode 100644 icu-rpmlint.diff delete mode 100644 icu4c-3_6-src-setBreakType-public.diff create mode 100644 icu4c-49_1-docs.zip create mode 100644 icu4c-49_1-src.tgz delete mode 100644 icu4c-4_0-docs.tar.bz2 delete mode 100644 icu4c-4_0-src.tar.bz2 delete mode 100644 ready diff --git a/SuSEconfig.icu b/SuSEconfig.icu deleted file mode 100644 index bb79293..0000000 --- a/SuSEconfig.icu +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. All rights reserved. -# -# Author: Mike Fabian , 2000 -# - - -for iculibdir in $(echo /usr/lib*/icu/ ) -do - echo "Adjust the current ICU link in $iculibdir ..." - - icucurrent=`2>/dev/null ls -dp ${iculibdir}/* | sed -n 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1` - cd $iculibdir - rm -f current - if test x"$icucurrent" != x - then - ln -s "$icucurrent" current - fi -done diff --git a/baselibs.conf b/baselibs.conf index 8b1602d..75304a0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ -libicu +libicu49 libicu-devel + requires -libicu- + requires "libicu49- = " diff --git a/icu-gcc44.patch b/icu-gcc44.patch deleted file mode 100644 index 102df36..0000000 --- a/icu-gcc44.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: source/layoutex/ParagraphLayout.cpp -=================================================================== ---- source/layoutex/ParagraphLayout.cpp.orig 2008-07-01 03:42:02.000000000 +0200 -+++ source/layoutex/ParagraphLayout.cpp 2009-03-02 21:47:07.000000000 +0100 -@@ -868,7 +868,7 @@ le_int32 ParagraphLayout::getLanguageCod - - return nullLanguageCode; - } --#elif -+#else - - // TODO - dummy implementation for right now... - le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) diff --git a/icu-remove-datetime.patch b/icu-remove-datetime.patch new file mode 100644 index 0000000..ab80fc9 --- /dev/null +++ b/icu-remove-datetime.patch @@ -0,0 +1,16 @@ +--- + source/Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +Index: icu/source/Makefile.in +=================================================================== +--- icu.orig/source/Makefile.in ++++ icu/source/Makefile.in +@@ -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 $@ + + config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h diff --git a/icu-rpmlint.diff b/icu-rpmlint.diff new file mode 100644 index 0000000..44bb8a8 --- /dev/null +++ b/icu-rpmlint.diff @@ -0,0 +1,29 @@ +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/tools/pkgdata/pkgdata.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: icu/source/tools/pkgdata/pkgdata.cpp +=================================================================== +--- icu.orig/source/tools/pkgdata/pkgdata.cpp ++++ icu/source/tools/pkgdata/pkgdata.cpp +@@ -1914,12 +1914,12 @@ static void loadLists(UPKGOptions *o, UE + const char cmd[] = "icu-config --incpkgdatafile"; + + /* #1 try the same path where pkgdata was called from. */ +- findDirname(progname, cmdBuf, 1024, &status); ++ findDirname(progname, cmdBuf, sizeof(cmdBuf), &status); + if(U_SUCCESS(status)) { + if (cmdBuf[0] != 0) { +- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024); ++ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf)); + } +- uprv_strncat(cmdBuf, cmd, 1024); ++ uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf)); + + if(verbose) { + fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf); diff --git a/icu.changes b/icu.changes index a0ce7b1..d7b2887 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,276 @@ +------------------------------------------------------------------- +Wed Jul 11 21:35:12 UTC 2012 - jengelh@inai.de + +- Remove SuSEconfig.icu; only run the link updater on icu updates + (FATE#313539) + +------------------------------------------------------------------- +Wed Jun 13 12:34:53 UTC 2012 - cfarrell@suse.com + +- license update: SUSE-XFree86-1.0 + The license (as stated in the license.html page) is not upstream at + http://www.spdx.org/licenses yet - thus, use this version (with SUSE- + proprietary prefix until the license goes upstream) + +------------------------------------------------------------------- +Tue Apr 10 10:22:49 UTC 2012 - cfarrell@suse.com + +- license update: MIT and SUSE-Public-Domain + This is _not_ IBM Public License code. + +------------------------------------------------------------------- +Tue Apr 3 12:45:07 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 49.1: +* Unicode 6.1: New scripts & blocks; changes to grapheme break & + line break property values; some characters change from symbol to + Po or No; etc. +* CLDR 21.0.1: Changes in segmentation data to match Unicode 6.1; + new structures for support of Chinese calendar, for + context-dependent capitalization, for gender of lists of people, + for ordinal categories, and for multiple number systems per + locale; deprecation of "commonlyUsed" element in timezone names; + removal of "whole-locale" aliases; major cleanups of timezone + names, delimiter data, abbreviated number data. +* Support for ISO 4217 numeric currency code +* See http://site.icu-project.org/download/49 for more + +------------------------------------------------------------------- +Sat Feb 25 14:57:50 UTC 2012 - jengelh@medozas.de + +- Use shlib policy for icu package +- Use proper data directory in CXXFLAGS + +------------------------------------------------------------------- +Wed Jan 18 12:14:28 UTC 2012 - vuntz@opensuse.org + +- Update to version 4.8.1.1: + + Time zone database version 2011k + + Several bug fixes. +- Changes from version 4.8.1: + + Common Locale Data Repository (CLDR) 2.0.1 + + Time zone database version 2011h + + Several bug fixes. +- Changes from version 4.8.0: + + Common Changes: + - CLDR 2.0: The CLDR 2.0 release contains numerous improvements + and bug fixes approved by the CLDR committee, including much + additional data for many languages. + - Explicit parent locale support in data imported from CLDR + - MessageFormat and related classes (choice/plural/select) have + been reimplemented, with several improvements and some + incompatible changes. + - Extended PluralFormat pattern syntax supports explicit-value + forms and offsets. + - Utility APIs in PluralRules (get some/all/unique keyword + values) + - Time zone API to return a list of available canonical system + time zone IDs + - Time zone API to return a region + - Collation: Full implementation & public API for script + reordering + - Dictionary-type trie + - GB18030-2005 update + + ICU4C Specific Changes: + - Alphabetic Index support ported from ICU4J + - X11 Compound Text encoding support ported from ICU4J + - Appendable interface +- Add unzip BuildRequires to handle .zip source file. +- Change the way we unpack the docs zip file: we need to create the + html subdirectory first, so we don't unpack via %setup but with + an explicit call to unzip. + +------------------------------------------------------------------- +Sat Dec 24 10:06:07 UTC 2011 - vuntz@opensuse.org + +- Remove call to suse_update_config, and stop removing + config.cache. + +------------------------------------------------------------------- +Thu Dec 22 09:47:32 UTC 2011 - vuntz@opensuse.org + +- Add automake BuildRequires that was implicit before, to fix + build. + +------------------------------------------------------------------- +Wed Oct 12 17:04:29 UTC 2011 - vuntz@opensuse.org + +- Drop pkgdata.diff: everything leads me to think this is not + needed anymore. Debian doesn't ship this patch with its 4.4 + version of ICU. This patch was just a workaround in the first + place anyway. + +------------------------------------------------------------------- +Tue Oct 11 22:26:44 CEST 2011 - dmueller@suse.de + +- Disable "make check" when run under qemu. + +------------------------------------------------------------------- +Tue Aug 2 15:40:36 UTC 2011 - idonmez@novell.com + +- Enable strict-aliasing again since the code seems to be fixed. +- Enable make check inside %check. +- Cleanup the spec file with spec-cleaner. + +------------------------------------------------------------------- +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 + +- Update to version 4.4.2: + + Common Changes: + - Update LMBCS mapping table + - Time zone data 2010l + + ICU4C Specific Changes: + - Fix: Difference between Java and C implementation with + exponent characters + - Fix: u_fflush (and thus u_fclose) not flushing stateful + converter + - Fix: unum_parseInt64 is not giving proper error + - Fix: Missing header files in Windows build + +------------------------------------------------------------------- +Thu Jul 8 21:02:02 UTC 2010 - jengelh@medozas.de + +- Update to version 4.4.1 + + Common Changes + - Common Locale Data Repository (CLDR) 1.8.1 + - Enabled non-Gregorian calendars in DateIntervalFormat +- Changes from version 4.4: + + Common Changes + - Unicode 5.2 support. + - CLDR 1.8 data - over 22% more data, with many new locales. + - Normalizer2 - for fast, flexible normalization, paving the + way for UTS #46 support of international domain names. + - Optimized resource bundle format to reduce the ICU resource + bundle installation footprint. + - Hebrew calendar month numbering improvement. + - Finer granular ICU locale resource data packaging. + - SelectFormat - for selecting a translation by a keyword among + multiple alternatives when formatting messages. + - Flexible hour pattern handling in DateFormatPatternGenerator. + - Updated LMBCS converter implementation. + - EBCDIC converter enhancement for supporting various SI/SO + codes used by non-IBM mainframes. + - 64bit time zone transition data support. + + ICU4C Specific Changes + - Regular Expressions support UText - allowing regular + expressions to work on large or discontiguous text + (Technology Preview). + - DecimalFormat support for big decimal numbers. + - ICU Plug-ins - for packaging a specific ICU servce as plug-in + and calling different versions of plug-ins in a same + environment (Technology Preview). + - C++ public smart pointers. + - Java modified UTF-8 support. + - Improved UnicodeString substring operations. + - New usearch options to control matching of collation elements +- Use %_smp_mflags +- Add icu44-rpmlint.diff to fix some build errors. +- Add pkgdata.diff to help build on some architecture, see + http://bugs.icu-project.org/trac/ticket/6969#comment:19. + +------------------------------------------------------------------- +Tue Apr 20 14:32:22 UTC 2010 - crrodriguez@opensuse.org + +- In JeOS, libicu is installed by default but it should + require timezone package to fullfill all dependencies. + +------------------------------------------------------------------- +Tue May 26 15:37:55 CEST 2009 - vuntz@novell.com + +- Drop icu4c-3_6-src-setBreakType-public.diff: it's not needed + anymore for OOo. + +------------------------------------------------------------------- +Sat May 23 14:14:40 CEST 2009 - vuntz@novell.com + +- Update to 4.2: + + Locale Data: ICU uses and supports data from Common Locale Data + Repository (CLDR) 1.7 , which includes data for 146 languages, + 159 territories, 468 locales- 21% more locale data than the + previous release. + + Number system support and the number keyword. + + Number system override in DateFormat. + + Numerics used by Hebrew Calendar date in Hebrew locale. + + BCP47 (language tag) / Locale transformation. + + BCP47 mapping of LDML keywords. + + Encoding selector: Return a list of charsets that can handle + the input text. + + Simple duration: Implementation of CLDR duration format. + + Available/Preferred keywords for a locale (Calendar, Collation, + and Currency). + + StringPrep standard profiles: RFC3491 NAMEPREP, RFC3530 NFS4, + RFC3722 iSCSI, RFC3920 NodePrep/ResourcePrep, RFC4011 MIB, + RFC4013 SASLprep, RFC4505 trace and RFC4518 LDAPprep. + + Miscellaneous Arabic shaping enhancements. + + UTF-8 friendly internal data structure for Unicode data lookup. + + API to get CLDR version used by ICU. + + ISCII charset converter updates (added Gurumukhi, other + updates). + + Performance improvements in Time Zone Name format/parse, and in + DateIntervalFormat construction. +- Remove AutoReqProv: it's default now. +- Drop icu-gcc44.patch: fixed upstream. +- Do not package packaging doc in libicu-doc. + +------------------------------------------------------------------- +Sat Mar 28 00:35:41 CET 2009 - vuntz@novell.com + +- Add icu-remove-datetime.patch to be more build-compare friendly. + ------------------------------------------------------------------- Mon Mar 2 22:07:18 CET 2009 - crrodriguez@suse.de @@ -84,7 +357,7 @@ Wed Feb 13 17:42:00 CET 2008 - maw@suse.de calendar used in Taiwan. * @calendar=indian: This is the Indian national calendar. * @calendar=persian: This is the Persian calendar. It is also - known as the JalÄli Calendar. It is used in several Arabic + known as the JalÄli Calendar. It is used in several Arabic countries. + UnicodeSet * The Freezable design pattern is now supported, which can diff --git a/icu.spec b/icu.spec index 38c2c2a..252eb50 100644 --- a/icu.spec +++ b/icu.spec @@ -1,7 +1,7 @@ # -# spec file for package icu (Version 4.0) +# spec file for package icu # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: icu -BuildRequires: gcc-c++ -License: X11/MIT -Group: System/Libraries -AutoReqProv: on -Version: 4.0 -Release: 8 -Requires: libicu = %{version} -Url: http://ibm.com/software/globalization/icu -Source0: icu4c-4_0-src.tar.bz2 -Source1: icu4c-4_0-docs.tar.bz2 -Source3: SuSEconfig.icu -# PATCH-FIX-UPSTREAM icu4c-3_6-src-setBreakType-public.diff -- OOo-2.3.1 and above needs to access the setBreakType method, see http://bugs.icu-project.org/trac/ticket/5498 -Patch: icu4c-3_6-src-setBreakType-public.diff -Patch1: icu-gcc44.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define lname libicu49 +Version: 49.1 +Release: 0 Summary: International Components for Unicode +License: SUSE-XFree86-1.0 +Group: System/Libraries +Url: http://ibm.com/software/globalization/icu +Source0: icu4c-49_1-src.tgz +Source1: icu4c-49_1-docs.zip +# 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: gcc-c++ +BuildRequires: pkg-config +BuildRequires: unzip +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ICU is a set of C and C++ libraries that provides robust and @@ -52,38 +52,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. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - -%package -n libicu -License: IBM Public License +%package -n %lname Summary: International Components for Unicode (development files) Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: libicu-64bit %endif -# -Provides: libicu17 libicu22 libicu26 libicu30 libicu32 libicu34 -Obsoletes: libicu17 libicu22 libicu26 libicu30 libicu32 libicu34 icu-i18ndata +Requires: timezone +Obsoletes: icu-i18ndata +# Following O/P added in timeframe for 12.2 +Provides: libicu = %version-%release +Obsoletes: libicu < %version-%release -%description -n libicu +%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. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %package -n libicu-devel -License: IBM Public License Summary: International Components for Unicode (development files) Group: Development/Libraries/C and C++ # bug437293 @@ -91,20 +79,13 @@ Group: Development/Libraries/C and C++ Obsoletes: libicu-devel-64bit %endif # -Requires: libicu = %{version} +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. - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. - %package -n libicu-doc -License: IBM Public License Summary: International Components for Unicode (html documentation) Group: Development/Libraries/C and C++ @@ -112,19 +93,12 @@ 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 Public License +%package data Summary: International Components for Unicode (Sources for the Data in ICU) Group: System/Libraries -Requires: libicu >= %{version} +Requires: %lname >= %{version} -%description -n icu-data +%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. @@ -133,59 +107,77 @@ 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 `libicu%{version}' package. - - - -Authors: --------- - The ICU project, International Business Machines (IBM) and Others. +the "%lname" package. %prep -%setup -q -n icu -a1 -%patch -%patch1 +%setup -q -n icu +mkdir html +pushd html +unzip %{SOURCE1} +popd +%patch1 -p1 +%patch99 -p1 %build cd source -rm -f config.cache -%{?suse_update_config:%{suse_update_config -f }} -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$CXXFLAGS -DICU_DATA_DIR='/usr/share/icu/4.0/'" +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags} -DICU_DATA_DIR=\\\"/usr/share/icu/%{version}/\\\"" %configure --disable-static --with-pic\ --enable-shared \ --without-samples -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -find . -name CVS -type d | xargs rm -rf +find . -name CVS -type d -exec rm -Rf "{}" "+" cd source -make DESTDIR=$RPM_BUILD_ROOT install + +%make_install + # to extract debug info -chmod a+rx $RPM_BUILD_ROOT%{_libdir}/*.so.* +chmod a+rx %{buildroot}%{_libdir}/*.so.* + # install uncompiled source data: -mkdir -p $RPM_BUILD_ROOT/usr/share/icu/%{version}/unidata -install -m 644 data/unidata/*.txt $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/unidata -ln -s unidata/UnicodeData.txt $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/ -# run test suite: -#pushd data -#ln -sf build/*.cnv build/*.res build/*.dat build/*.brk . -#popd -#make check || echo "make check returned $?, ignored." -#popd -mkdir -p $RPM_BUILD_ROOT/sbin/conf.d/ -sed -e "s/@ICUVERSION@/%{version}/g" < ${RPM_SOURCE_DIR}/SuSEconfig.icu > ./SuSEconfig.icu -install -m 755 ./SuSEconfig.icu $RPM_BUILD_ROOT/sbin/conf.d/ -rm $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/license.html -rm $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/install-sh +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}/ -%clean -rm -rf $RPM_BUILD_ROOT +rm %{buildroot}/%{_datadir}/icu/%{version}/license.html +rm %{buildroot}/%{_datadir}/icu/%{version}/install-sh -%post -n libicu -p /sbin/ldconfig +%check +cd source +%if !0%{?qemu_user_space_build:1} +# Checks disabled in qemu because of races happening when we emulate +# multi-threaded programs, and some check tests atomic instructions in +# multi-threaded icu invocations +make check +%endif -%postun -n libicu -p /sbin/ldconfig +# This should be run by whatever owns /usr/lib64/icu - +# 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' | + sort -V | tail -n1); + if test -n "$current"; then + 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); + if test -n "$current"; then + 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 %defattr(-, root, root) @@ -193,197 +185,46 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/icu/ %dir %{_libdir}/icu/%{version} %{_libdir}/icu/current -/usr/bin/derb -/usr/bin/genbrk -/usr/bin/gencnval -/usr/bin/genrb -/usr/bin/genctd -/usr/bin/makeconv -/usr/bin/pkgdata -/usr/bin/uconv -/usr/sbin/* +%{_bindir}/derb +%{_bindir}/genbrk +%{_bindir}/gencfu +%{_bindir}/gencnval +%{_bindir}/genrb +%{_bindir}/genctd +%{_bindir}/icuinfo +%{_bindir}/makeconv +%{_bindir}/pkgdata +%{_bindir}/uconv +%{_sbindir}/* %{_mandir}/*/* -/sbin/conf.d/SuSEconfig.icu -%files -n libicu +%files -n %lname %defattr(-, root, root) %attr (755, root, root) %{_libdir}/lib*.so.* %files -n libicu-devel %defattr(-, root, root) %{_libdir}/lib*.so -/usr/include/unicode/ -/usr/include/layout/ +%{_includedir}/unicode/ +%{_includedir}/layout/ %{_libdir}/icu/%{version}/Makefile.inc +%{_libdir}/icu/%{version}/pkgdata.inc %{_libdir}/icu/Makefile.inc -/usr/bin/icu-config -%dir /usr/share/icu -%dir /usr/share/icu/%{version} -/usr/share/icu/%{version}/mkinstalldirs -/usr/share/icu/%{version}/config/ +%{_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) %doc html/ -%doc packaging/ -%files -n icu-data +%files data %defattr(-, root, root) -%dir /usr/share/icu/%{version}/unidata -/usr/share/icu/%{version}/unidata/* -/usr/share/icu/%{version}/UnicodeData.txt +%{_datadir}/icu/%{version}/unidata/ +%{_datadir}/icu/%{version}/UnicodeData.txt %changelog -* Mon Mar 02 2009 crrodriguez@suse.de -- fix build with GCC 4.4 -- remove static libraries -* Wed Dec 10 2008 olh@suse.de -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) -* Thu Oct 30 2008 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Sat Sep 13 2008 vuntz@novell.com -- Merge with openSUSE:Factory. Redo the patch tags that were done - by jpr@novell.com -* Fri Sep 05 2008 maw@suse.de -- Update to version 4.0: - (All of the bug numbers listed are against - http://bugs.icu-project.org/trac) - + Update to Unicode 5.1 (#5696) - + Locale Data: ICU uses and supports data from Common Locale Data - Repository (CLDR) 1.6, which includes many improvements in - quality and quantity of data - + Add/removeLikelySubtags (#6124) - + Charset converter file size improvement (#5987) - + Date Interval Formatting (#6157) Note: Calendar type supported - by this feature is Gregorian only in this release - + Improved Plural support - + Additional calendars: Chinese (#4081) and Coptic/Ethiopic - (#4571) - + Security fixes for CVE-2007-4770, CVE-2007-4771, and - CVE-2008-1036. -- Drop libicu-regex.patch, which has been upstreamed. -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Wed Feb 13 2008 maw@suse.de -- Update to version 3.8: - + Locale Data: ICU uses and supports data from Common Locale Data - Repository (CLDR) 1.5.0.1, which includes many improvements in - quality and quantity of data. - + Rule Based Time Zone: This set of classes provides the ability - to read and write time zone data in RFC2445 VTIMEZONE format. - This also provides access Olson timezone transitions. - + Timezone Formatting: This has changed to give more human - readable results. - + Relative Date/Time Formatting: A draft of the relative date/time - format class has been added. This functionality can be accessed - through the DateFormat::createDateInstance or DateFormat.getInstance - factory method. It provides the ability to format localized dates - in terms of "yesterday", "today" and "tomorrow", instead of a - specific only date or time. - + Demonstrations and Tools - * ICU Data Library Customizer: This new online tool provides an - easier way customize ICU's data. - * ICU4J Demonstrations: These will demonstrate some features of - ICU4J, like calendars, transliteration, and several other - features. - + Flexible Date/Time Formatting: A draft of flexible date/time - format generator has been added. This allows multiple date and - time format patterns to be generated that are valid for specific - locales. This funtionality can be accessed through the - DateTimePatternGenerator API. - + Time Zones: The default time zone is detected more accurately - on Unix machines. - + Additional Calendars - * @calendar=taiwan: This calendar is a variant of the Gregorian - calendar used in Taiwan. - * @calendar=indian: This is the Indian national calendar. - * @calendar=persian: This is the Persian calendar. It is also - known as the JalÄli Calendar. It is used in several Arabic - countries. - + UnicodeSet - * The Freezable design pattern is now supported, which can - improve performance for the contains() and span() methods - on frozen UnicodeSet objects. - * A span function was added for iterating through strings. - * The containsAll(string) and containsNone(string) now support - set strings, instead of only codepoints. - + Performance - * Charset conversion performance has been enhanced. The - amount of improvement varies depending on the converter - being used and platform being used. - * Rule based transliterator construction performance has been - improved. -- s#%%run_ldconfig#/sbin/ldconfig# in libicu's %%post and %%postun -- add libicu-regex.patch (bnc#354372). -* Thu Feb 07 2008 pmladek@suse.cz -- made RuleBasedBreakIterator::setBreakType method pubclic; it was requested by - OpenOffice_org >= 2.3.1, see http://bugs.icu-project.org/trac/ticket/5498 -* Wed Jul 25 2007 pmladek@suse.cz -- Updated to version 3.6 - * supports Unicode 5.0 - * supports data from Common Locale Data Repository (CLDR) 1.4 - * charset detection framework was added - * font layout engine has support added for Tibetan, Sinhala and Old Hangul - * BiDi algorithm was enhanced to be more flexible and efficient - * new icupkg tool provides an easier way to manage ICU's data library - * time zone data is modularized to allow easier building and updating of - the data - * BreakIterator uses UText for abstract text processing - * 64-bit indexing is now used to allow access to larger chunks of text - * added API for read-only locking for security and robustness - * lots performance improvements -* Mon Feb 13 2006 olh@suse.de -- mark libraries as executable to extract debuginfo -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Aug 03 2005 sbrabec@suse.cz -- Updated to version 3.4. -* Mon Mar 28 2005 gekker@suse.de -- Move icu-config to libicu-devel package (8030). -* Mon Jan 10 2005 sbrabec@suse.cz -- Updated to version 3.2 (#49578). - Updated by Robert Schiele . -- Added -fno-strict-aliasing. -* Fri Nov 19 2004 ro@suse.de -- ignore return-code from strip call -* Tue May 25 2004 clahey@suse.de -- Removed --with-data-packaging=files. Fixes gtk-sharp compilation. -* Mon May 24 2004 clahey@suse.de -- Updated to 2.6.2. -* Wed Mar 31 2004 mfabian@suse.de -- Bugzilla #37029: "strip --strip-debug" static libraries to save - space on the CDs. -* Fri Jan 23 2004 uli@suse.de -- removed --disable-rpath; it is unnecessary and breaks the - icu-config script -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Tue Sep 23 2003 mfabian@suse.de -- Bugzilla #31665: "SuSEconfig.icu is not lib64 clean" fixed. -* Mon Aug 18 2003 mfabian@suse.de -- update to 2.6. -* Mon Jun 16 2003 mfabian@suse.de -- fix "directory not owned by any package". -* Fri May 16 2003 mfabian@suse.de -- fix file list, remove CVS directories. -* Wed Sep 11 2002 mfabian@suse.de -- /usr/sbin/gencnval is now in /usr/bin/gencnval. - Fix SuSEconfig.icu accordingly. -* Sat Aug 17 2002 mfabian@suse.de -- update to 2.2 -* Sun Aug 11 2002 mfabian@suse.de -- add Provides: libicu17 to libicu21 subpackage - (to trigger the selection of the new package during update.) -* Fri Aug 09 2002 mfabian@suse.de -- update to 2.1 -* Tue Mar 12 2002 mfabian@suse.de -- use %%{_libdir} -* Tue Mar 12 2002 kukuk@suse.de -- Fix most wrong directories in filelist -* Mon Feb 11 2002 ro@suse.de -- tar option for bz2 is "j" -* Wed Mar 07 2001 mfabian@suse.de -- new package: icu 1.7 -- package names as described in PACKAGING diff --git a/icu4c-3_6-src-setBreakType-public.diff b/icu4c-3_6-src-setBreakType-public.diff deleted file mode 100644 index b410044..0000000 --- a/icu4c-3_6-src-setBreakType-public.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- source/common/unicode/rbbi.h -+++ source/common/unicode/rbbi.h -@@ -611,12 +611,14 @@ - virtual int32_t getBreakType() const; - #endif - -+public: - /** - * Set the type of the break iterator. - * @internal - */ - virtual void setBreakType(int32_t type); - -+protected: - /** - * Common initialization function, used by constructors and bufferClone. - * (Also used by DictionaryBasedBreakIterator::createBufferClone().) diff --git a/icu4c-49_1-docs.zip b/icu4c-49_1-docs.zip new file mode 100644 index 0000000..0a5aec8 --- /dev/null +++ b/icu4c-49_1-docs.zip @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..faf4a57 --- /dev/null +++ b/icu4c-49_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6399f00941d982c64fef96b0094dd2f7c1421f8a0c113686d5f123daf8eabca +size 19000749 diff --git a/icu4c-4_0-docs.tar.bz2 b/icu4c-4_0-docs.tar.bz2 deleted file mode 100644 index c6c0396..0000000 --- a/icu4c-4_0-docs.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:550c05b2469c1626f6bba1ec491eaa7ddc78730c0a12ebd4fcfe7a1749dc8ddc -size 297209 diff --git a/icu4c-4_0-src.tar.bz2 b/icu4c-4_0-src.tar.bz2 deleted file mode 100644 index aa6e9d6..0000000 --- a/icu4c-4_0-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d6a4cff4d83aec978eca493bdee6e028be68e4a8e990d98852d09a61b2856f1 -size 9375923 diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000