OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=12

2009-05-27 22:41:07 +00:00 · 2009-05-27 22:41:07 +00:00 · bcaff8d85e
commit bcaff8d85e
parent 2b68c82fd9
8 changed files with 106 additions and 71 deletions
--- a/icu-gcc44.patch
+++ b/icu-gcc44.patch
@ -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)
--- a/icu.changes
+++ b/icu.changes
@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+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

@ -89,7 +127,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
--- a/icu.spec
+++ b/icu.spec
@ -1,5 +1,5 @@
 #
-# spec file for package icu (Version 4.0)
+# spec file for package icu (Version 4.2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -22,19 +22,15 @@ Name:           icu
 BuildRequires:  gcc-c++
 License:        X11/MIT
 Group:          System/Libraries
-AutoReqProv:    on
-Version:        4.0
-Release:        9
+Version:        4.2
+Release:        1
 Requires:       libicu = %{version}
 Url:            http://ibm.com/software/globalization/icu
-Source0:        icu4c-4_0-src.tar.bz2
-Source1:        icu4c-4_0-docs.tar.bz2
+Source0:        icu4c-4_2-src.tar.bz2
+Source1:        icu4c-4_2-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
 # PATCH-FIX-OPENSUSE icu-remove-datetime.patch vuntz@novell.com -- Do not put date/time in icu-config (needed for build-compare)
-Patch2:         icu-remove-datetime.patch
+Patch99:        icu-remove-datetime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        International Components for Unicode

@ -145,9 +141,7 @@ Authors:

 %prep
 %setup -q -n icu -a1
-%patch
-%patch1
-%patch2 -p1
+%patch99 -p1

 %build
 cd source
@ -196,14 +190,15 @@ 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
+%{_bindir}/derb
+%{_bindir}/genbrk
+%{_bindir}/gencfu
+%{_bindir}/gencnval
+%{_bindir}/genrb
+%{_bindir}/genctd
+%{_bindir}/makeconv
+%{_bindir}/pkgdata
+%{_bindir}/uconv
 /usr/sbin/*
 %{_mandir}/*/*
 /sbin/conf.d/SuSEconfig.icu
@ -215,28 +210,60 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%{_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
 %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
+* Tue May 26 2009 vuntz@novell.com
+- Drop icu4c-3_6-src-setBreakType-public.diff: it's not needed
+  anymore for OOo.
+* Sat May 23 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 2009 vuntz@novell.com
 - Add icu-remove-datetime.patch to be more build-compare friendly.
 * Mon Mar 02 2009 crrodriguez@suse.de
@ -250,7 +277,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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
+* Sat Sep 06 2008 maw@suse.de
 - Update to version 4.0:
  (All of the bug numbers listed are against
  http://bugs.icu-project.org/trac)
@ -305,7 +332,7 @@ rm -rf $RPM_BUILD_ROOT
  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
--- a/icu4c-3_6-src-setBreakType-public.diff
+++ b/icu4c-3_6-src-setBreakType-public.diff
@ -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().)
--- a/icu4c-4_0-docs.tar.bz2
+++ b/icu4c-4_0-docs.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:550c05b2469c1626f6bba1ec491eaa7ddc78730c0a12ebd4fcfe7a1749dc8ddc
-size 297209
--- a/icu4c-4_0-src.tar.bz2
+++ b/icu4c-4_0-src.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d6a4cff4d83aec978eca493bdee6e028be68e4a8e990d98852d09a61b2856f1
-size 9375923
--- a/icu4c-4_2-docs.tar.bz2
+++ b/icu4c-4_2-docs.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f6fd2306deea10fc2601cef1b64c1f6071eae4ecec6b66a9069b2bab4df6e31
+size 3029418
--- a/icu4c-4_2-src.tar.bz2
+++ b/icu4c-4_2-src.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2b8a0f412cbb42140ee6b83a2c6ea71dbde23ca8199c9bbe3a2eda9d15eda39
+size 11545277