From: Jakub Bogusz Date: Fri, 13 May 2016 14:51:55 +0000 (+0200) Subject: - updated to 57.1 (new soname as usual...) X-Git-Tag: auto/th/icu-57.1-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=4271d8283fa2810da36310153cb3fbfc3ad4d5c9;p=packages%2Ficu.git - updated to 57.1 (new soname as usual...) - removed obsolete flagparser patch --- diff --git a/icu-flagparser.patch b/icu-flagparser.patch deleted file mode 100644 index 61d214c..0000000 --- a/icu-flagparser.patch +++ /dev/null @@ -1,38 +0,0 @@ -In case of too small buffer (U_BUFFER_OVERFLOW_ERROR) parseFlagsFile must return -wanted buffer size (stored in result) instead of -1. - ---- icu/source/tools/toolutil/flagparser.c.orig 2015-10-08 05:54:06.000000000 +0200 -+++ icu/source/tools/toolutil/flagparser.c 2015-11-15 21:10:17.988942482 +0100 -@@ -30,6 +30,7 @@ - FileStream *f = T_FileStream_open(fileName, "r"); - if (f == NULL) { - *status = U_FILE_ACCESS_ERROR; -+ result = -1; - goto parseFlagsFile_cleanup; - } - -@@ -38,6 +39,7 @@ - - if (buffer == NULL || tmpFlagBuffer == NULL) { - *status = U_MEMORY_ALLOCATION_ERROR; -+ result = -1; - goto parseFlagsFile_cleanup; - } - -@@ -49,6 +51,7 @@ - buffer = uprv_malloc(sizeof(char) * currentBufferSize); - if (buffer == NULL) { - *status = U_MEMORY_ALLOCATION_ERROR; -+ result = -1; - goto parseFlagsFile_cleanup; - } - } -@@ -98,7 +101,7 @@ - T_FileStream_close(f); - - if (U_FAILURE(*status)) { -- return -1; -+ return result; - } - - if (U_SUCCESS(*status) && result == 0) { diff --git a/icu.spec b/icu.spec index 0761d9e..8399a02 100644 --- a/icu.spec +++ b/icu.spec @@ -6,13 +6,12 @@ Summary: International Components for Unicode Summary(pl.UTF-8): Międzynarodowe komponenty dla unikodu Name: icu -Version: 56.1 -Release: 2 +Version: 57.1 +Release: 1 License: MIT-like Group: Libraries Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{ver}-src.tgz -# Source0-md5: c4a2d71ff56aec5ebfab2a3f059be99d -Patch0: %{name}-flagparser.patch +# Source0-md5: 976734806026a4ef8bdd17937c8898b9 URL: http://www.icu-project.org/ BuildRequires: autoconf >= 2.69 BuildRequires: libstdc++-devel @@ -95,7 +94,6 @@ biblioteki programistyczne ICU. %prep %setup -q -n %{name} -%patch0 -p1 %build cd source @@ -131,7 +129,7 @@ for f in Makefile.inc pkgdata.inc ; do ln -sf %{version}/${f} $RPM_BUILD_ROOT%{_libdir}/%{name}/${f} done -%{__rm} $RPM_BUILD_ROOT%{_datadir}/icu/%{version}/license.html +%{__rm} $RPM_BUILD_ROOT%{_datadir}/icu/%{version}/LICENSE %clean rm -rf $RPM_BUILD_ROOT @@ -160,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libicu %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libicu*.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libicu*.so.56 +%attr(755,root,root) %ghost %{_libdir}/libicu*.so.57 %files -n libicu-devel %defattr(644,root,root,755)