diff --git a/.abf.yml b/.abf.yml index 5e82760..24d3db4 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - "icu4c-4_8-docs.zip": c10d4dc711438763631564ace8200e3cef66f190 - "icu4c-4_8-src.tgz": f458b41800cc21bbb92ceb119380ad3249252fd6 + "icu4c-49_1_1-docs.zip": c9fcd1571cdfe5848d1336841624b3b92d259cb6 + "icu4c-49_1_1-src.tgz": f407d7e2808b76e3a6ca316aab896aef74bf6722 diff --git a/icu.spec b/icu.spec index 0e541e6..c87bab4 100644 --- a/icu.spec +++ b/icu.spec @@ -1,24 +1,29 @@ -%define major 48 -%define libname %mklibname icu %{major} -%define develname %mklibname icu -d -%define realversion 4.8 -%define tarballver %(echo %realversion|sed -e 's|\\.|_|g') +%define major %(echo %version |cut -d. -f1) +%define libicudata %mklibname %{name}data %{major} +%define libicui18n %mklibname %{name}i18n %{major} +%define libicuio %mklibname %{name}io %{major} +%define libicule %mklibname %{name}le %{major} +%define libiculx %mklibname %{name}lx %{major} +%define libicutest %mklibname %{name}test %{major} +%define libicutu %mklibname %{name}tu %{major} +%define libicuuc %mklibname %{name}uc %{major} +%define develname %mklibname %{name} -d + +%define tarballver %(echo %version|sed -e 's|\\.|_|g') Summary: International Components for Unicode Name: icu -Version: 4.8 -Release: 2 Epoch: 1 +Version: 49.1.1 +Release: 1 License: MIT Group: System/Libraries URL: http://www.icu-project.org/index.html Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarballver}-src.tgz Source1: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarballver}-docs.zip -Patch0: %{name}4c-3_8-setBreakType.patch +Patch0: %{name}4c-49.1-setBreakType.patch Patch6: icu-4.6.1-do-not-promote-ldflags.patch -Patch7: icu4c-4_8-CVE-2011-4599.diff BuildRequires: doxygen -Requires: %{libname} >= %{epoch}:%{version}-%{release} %description The International Components for Unicode (ICU) libraries provide robust and @@ -53,20 +58,77 @@ Requires: %{name} >= %{epoch}:%{version}-%{release} %description doc Documentation for the International Components for Unicode. -%package -n %{libname} -Summary: Libraries for the International Components for Unicode +%package -n %{libicudata} +Summary: Library for the International Components for Unicode - icudata Group: System/Libraries -%description -n %{libname} -Libraries for the International Components for Unicode. +%description -n %{libicudata} +Library for the International Components for Unicode - icudata. + +%package -n %{libicui18n} +Summary: Library for the International Components for Unicode - icui18n +Group: System/Libraries + +%description -n %{libicui18n} +Library for the International Components for Unicode - icui18n. + +%package -n %{libicuio} +Summary: Library for the International Components for Unicode - icuio +Group: System/Libraries + +%description -n %{libicuio} +Library for the International Components for Unicode - icuio. + +%package -n %{libicule} +Summary: Library for the International Components for Unicode - icule +Group: System/Libraries + +%description -n %{libicule} +Library for the International Components for Unicode - icule. + +%package -n %{libiculx} +Summary: Library for the International Components for Unicode - iculx +Group: System/Libraries + +%description -n %{libiculx} +Library for the International Components for Unicode - iculx. + +%package -n %{libicutest} +Summary: Library for the International Components for Unicode - icutest +Group: System/Libraries + +%description -n %{libicutest} +Library for the International Components for Unicode - icutest. + +%package -n %{libicutu} +Summary: Library for the International Components for Unicode - icutu +Group: System/Libraries + +%description -n %{libicutu} +Library for the International Components for Unicode - icutu. + +%package -n %{libicuuc} +Summary: Library for the International Components for Unicode - icuuc +Group: System/Libraries + +%description -n %{libicuuc} +Library for the International Components for Unicode - icuuc. %package -n %{develname} Summary: Development files for the International Components for Unicode Group: Development/Other -Requires: %{libname} >= %{epoch}:%{version}-%{release} +Requires: %{libicudata} >= %{epoch}:%{version}-%{release} +Requires: %{libicui18n} >= %{epoch}:%{version}-%{release} +Requires: %{libicuio} >= %{epoch}:%{version}-%{release} +Requires: %{libicule} >= %{epoch}:%{version}-%{release} +Requires: %{libiculx} >= %{epoch}:%{version}-%{release} +Requires: %{libicutest} >= %{epoch}:%{version}-%{release} +Requires: %{libicutu} >= %{epoch}:%{version}-%{release} +Requires: %{libicuuc} >= %{epoch}:%{version}-%{release} Provides: %{name}%{major}-devel = %{epoch}:%{version}-%{release} Provides: %{name}-devel = %{epoch}:%{version}-%{release} Provides: lib%{name}-devel = %{epoch}:%{version}-%{release} +Obsoletes: %mklibname -d icu 48 Obsoletes: %mklibname -d icu 36 Obsoletes: %mklibname -d icu 34 #define _requires_exceptions statically\\|linked @@ -79,7 +141,6 @@ Development files and headers for the International Components for Unicode. %setup -q -n %{name} %patch0 -p1 -b .setBreakType %patch6 -p0 -b .ldflags -%patch7 -p0 -b .CVE-2011-4599 mkdir -p docs cd docs @@ -120,8 +181,29 @@ popd %{_mandir}/man1/* %{_mandir}/man8/* -%files -n %{libname} -%{_libdir}/*.so.%{major}* +%files -n %{libicudata} +%{_libdir}/libicudata.so.%{major}* + +%files -n %{libicui18n} +%{_libdir}/libicui18n.so.%{major}* + +%files -n %{libicuio} +%{_libdir}/libicuio.so.%{major}* + +%files -n %{libicule} +%{_libdir}/libicule.so.%{major}* + +%files -n %{libiculx} +%{_libdir}/libiculx.so.%{major}* + +%files -n %{libicutest} +%{_libdir}/libicutest.so.%{major}* + +%files -n %{libicutu} +%{_libdir}/libicutu.so.%{major}* + +%files -n %{libicuuc} +%{_libdir}/libicuuc.so.%{major}* %files -n %{develname} %{_bindir}/icu-config @@ -138,6 +220,18 @@ popd %changelog +* Sat Apr 07 2012 Bernhard Rosenkraenzer 1:49.1.1-1 ++ Revision: 789731 +- Update to 49.1.1 + +* Fri Feb 17 2012 Matthew Dawkins 1:4.8-4 ++ Revision: 776216 +- rebuild to obsolete old lib pkg + +* Fri Feb 17 2012 Matthew Dawkins 1:4.8-3 ++ Revision: 776158 +- split out individual libs + * Thu Jan 12 2012 Oden Eriksson 1:4.8-2 + Revision: 760505 - sync with MDVSA-2011:194 diff --git a/icu4c-3_8-setBreakType.patch b/icu4c-49.1-setBreakType.patch similarity index 52% rename from icu4c-3_8-setBreakType.patch rename to icu4c-49.1-setBreakType.patch index 682e604..1edcf23 100644 --- a/icu4c-3_8-setBreakType.patch +++ b/icu4c-49.1-setBreakType.patch @@ -1,28 +1,27 @@ ---- icu/source/common/unicode/rbbi.h.mrl 2007-12-11 08:29:28.000000000 -0500 -+++ icu/source/common/unicode/rbbi.h 2007-12-11 08:30:02.000000000 -0500 -@@ -581,6 +581,12 @@ public: +--- icu/source/common/unicode/rbbi.h.setBreakType 2012-04-05 22:46:08.000000000 +0200 ++++ icu/source/common/unicode/rbbi.h 2012-04-07 19:18:41.629484616 +0200 +@@ -658,6 +658,11 @@ public: */ - virtual const uint8_t *getBinaryRules(uint32_t &length); + virtual RuleBasedBreakIterator &refreshInputText(UText *input, UErrorCode &status); + /** + * Set the type of the break iterator. + * @internal + */ -+ // Must be public (OOo requirement) + virtual void setBreakType(int32_t type); protected: //======================================================================= -@@ -612,12 +618,6 @@ protected: +@@ -688,12 +693,6 @@ protected: + virtual int32_t getBreakType() const; #endif - /** +- /** - * Set the type of the break iterator. - * @internal - */ - virtual void setBreakType(int32_t type); - -- /** + #ifndef U_HIDE_INTERNAL_API + /** * Common initialization function, used by constructors and bufferClone. - * (Also used by DictionaryBasedBreakIterator::createBufferClone().) - * @internal diff --git a/icu4c-4_8-CVE-2011-4599.diff b/icu4c-4_8-CVE-2011-4599.diff deleted file mode 100644 index bb06141..0000000 --- a/icu4c-4_8-CVE-2011-4599.diff +++ /dev/null @@ -1,24 +0,0 @@ - -https://bugzilla.redhat.com/show_bug.cgi?id=765812 -(icu-4.2.1-9.1.el6_2.src.rpm) - ---- source/common/uloc.c 2011-05-23 21:56:08.000000000 +0000 -+++ source/common/uloc.c.oden 2011-12-27 10:20:29.000000000 +0000 -@@ -1797,7 +1797,7 @@ _canonicalize(const char* localeID, - int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n); - len -= variantLen; - if (variantLen > 0) { -- if (name[len-1] == '_') { /* delete trailing '_' */ -+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */ - --len; - } - addKeyword = VARIANT_MAP[j].keyword; -@@ -1805,7 +1805,7 @@ _canonicalize(const char* localeID, - break; - } - } -- if (name[len-1] == '_') { /* delete trailing '_' */ -+ if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */ - --len; - } - }