Djam/icu
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/icu.git synced 2025-02-23 19:02:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG New version 49.1.1 (sync with Cooker), fix unversioned Obsoletes

Browse source
This commit is contained in:
abondrov 2012-08-07 00:14:51 +00:00
parent 7dd2f7fd32
commit a64fd7cfce
4 changed files with 305 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
"icu4c-4_8-docs.zip": c10d4dc711438763631564ace8200e3cef66f190 "icu4c-49_1_1-docs.zip": c9fcd1571cdfe5848d1336841624b3b92d259cb6
"icu4c-4_8-src.tgz": f458b41800cc21bbb92ceb119380ad3249252fd6 "icu4c-49_1_1-src.tgz": f407d7e2808b76e3a6ca316aab896aef74bf6722

336
icu.spec
View file

@ -1,25 +1,29 @@
%define major 48 %define major %(echo %version |cut -d. -f1)
%define libname %mklibname icu %{major} %define libicudata %mklibname %{name}data %{major}
%define develname %mklibname icu -d %define libicui18n %mklibname %{name}i18n %{major}
%define realversion 4.8 %define libicuio %mklibname %{name}io %{major}
%define tarballver %(echo %realversion|sed -e 's|\\.|_|g') %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 Summary: International Components for Unicode
Name: icu Name: icu
Version: 4.8
Release: %mkrel 5
Epoch: 1 Epoch: 1
Version: 49.1.1
Release: 2
License: MIT License: MIT
Group: System/Libraries Group: System/Libraries
URL: http://www.icu-project.org/index.html URL: http://www.icu-project.org/index.html
Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarballver}-src.tgz 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 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 Patch6: icu-4.6.1-do-not-promote-ldflags.patch
Patch7: icu4c-4_8-CVE-2011-4599.diff
BuildRequires: doxygen BuildRequires: doxygen
Requires: %{libname} = %{epoch}:%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%description %description
The International Components for Unicode (ICU) libraries provide robust and The International Components for Unicode (ICU) libraries provide robust and
@ -49,27 +53,84 @@ include:
%package doc %package doc
Summary: Documentation for the International Components for Unicode Summary: Documentation for the International Components for Unicode
Group: System/Libraries Group: System/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} >= %{EVRD}
%description doc %description doc
Documentation for the International Components for Unicode. Documentation for the International Components for Unicode.
%package -n %{libname} %package -n %{libicudata}
Summary: Libraries for the International Components for Unicode Summary: Library for the International Components for Unicode - icudata
Group: System/Libraries Group: System/Libraries
%description -n %{libname} %description -n %{libicudata}
Libraries for the International Components for Unicode. 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} %package -n %{develname}
Summary: Development files for the International Components for Unicode Summary: Development files for the International Components for Unicode
Group: Development/Other Group: Development/Other
Requires: %{libname} = %{epoch}:%{version}-%{release} Requires: %{libicudata} >= %{EVRD}
Provides: %{name}%{major}-devel = %{epoch}:%{version}-%{release} Requires: %{libicui18n} >= %{EVRD}
Provides: %{name}-devel = %{epoch}:%{version}-%{release} Requires: %{libicuio} >= %{EVRD}
Provides: lib%{name}-devel = %{epoch}:%{version}-%{release} Requires: %{libicule} >= %{EVRD}
Obsoletes: %mklibname -d icu 36 Requires: %{libiculx} >= %{EVRD}
Obsoletes: %mklibname -d icu 34 Requires: %{libicutest} >= %{EVRD}
Requires: %{libicutu} >= %{EVRD}
Requires: %{libicuuc} >= %{EVRD}
Provides: %{name}%{major}-devel = %{EVRD}
Provides: %{name}-devel = %{EVRD}
Provides: lib%{name}-devel = %{EVRD}
Obsoletes: %{mklibname -d icu 48} < 1:49
Obsoletes: %{mklibname -d icu 36} < 1:49
Obsoletes: %{mklibname -d icu 34} < 1:49
#define _requires_exceptions statically\\|linked #define _requires_exceptions statically\\|linked
%description -n %{develname} %description -n %{develname}
@ -79,7 +140,6 @@ Development files and headers for the International Components for Unicode.
%setup -q -n %{name} %setup -q -n %{name}
%patch0 -p1 -b .setBreakType %patch0 -p1 -b .setBreakType
%patch6 -p0 -b .ldflags %patch6 -p0 -b .ldflags
%patch7 -p0 -b .CVE-2011-4599
mkdir -p docs mkdir -p docs
cd docs cd docs
@ -89,8 +149,8 @@ cd -
%build %build
pushd source pushd source
# (tpg) needed for patch 2 # (tpg) needed for patch 2
export CFLAGS='%optflags -fno-strict-aliasing' export CFLAGS='%{optflags} -fno-strict-aliasing'
export CXXFLAGS='%optflags -fno-strict-aliasing' export CXXFLAGS='%{optflags} -fno-strict-aliasing'
%configure2_5x \ %configure2_5x \
--with-library-bits=64else32 \ --with-library-bits=64else32 \
--with-data-packaging=library \ --with-data-packaging=library \
@ -110,35 +170,41 @@ pushd source
%makeinstall_std %makeinstall_std
popd popd
%clean
rm -rf %{buildroot}
%if %mdkversion < 200900
%post -n %{libname} -p /sbin/ldconfig
%endif
%if %mdkversion < 200900
%postun -n %{libname} -p /sbin/ldconfig
%endif
%files %files
%defattr(-,root,root)
%{_bindir}/* %{_bindir}/*
%exclude %{_bindir}/icu-config %exclude %{_bindir}/icu-config
%{_sbindir}/* %{_sbindir}/*
%files doc %files doc
%defattr(-,root,root)
%doc readme.html docs/* %doc readme.html docs/*
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man8/* %{_mandir}/man8/*
%files -n %{libname} %files -n %{libicudata}
%defattr(-,root,root) %{_libdir}/libicudata.so.%{major}*
%{_libdir}/*.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} %files -n %{develname}
%defattr(-,root,root)
%{_bindir}/icu-config %{_bindir}/icu-config
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
@ -152,3 +218,189 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/* %{_datadir}/%{name}/*
%changelog
* Sat Apr 07 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:49.1.1-1
+ Revision: 789731
- Update to 49.1.1
* Fri Feb 17 2012 Matthew Dawkins <mattydaw@mandriva.org> 1:4.8-4
+ Revision: 776216
- rebuild to obsolete old lib pkg
* Fri Feb 17 2012 Matthew Dawkins <mattydaw@mandriva.org> 1:4.8-3
+ Revision: 776158
- split out individual libs
* Thu Jan 12 2012 Oden Eriksson <oeriksson@mandriva.com> 1:4.8-2
+ Revision: 760505
- sync with MDVSA-2011:194
* Sun Jun 05 2011 Funda Wang <fwang@mandriva.org> 1:4.8-1
+ Revision: 682800
- new version 4.8
* Wed May 04 2011 Oden Eriksson <oeriksson@mandriva.com> 1:4.6.1-3
+ Revision: 665501
- mass rebuild
* Mon Mar 14 2011 Funda Wang <fwang@mandriva.org> 1:4.6.1-2
+ Revision: 644587
- do not promote ldflags in icu-config
* Mon Mar 14 2011 Funda Wang <fwang@mandriva.org> 1:4.6.1-1
+ Revision: 644490
- update file list
- new version 4.6.1
- drop merged patches and old icu-config
* Mon Oct 04 2010 Funda Wang <fwang@mandriva.org> 1:4.4.2-1mdv2011.0
+ Revision: 582874
- new version 4.4.2
* Sat Jul 31 2010 Funda Wang <fwang@mandriva.org> 1:4.4.1-1mdv2011.0
+ Revision: 563953
- do not use strict alias patch but use cflags, upstream does not like the patch
- add upstream patch to deal with buffer overflow problem
- revert to 4.4.1 stable
+ Matthew Dawkins <mattydaw@mandriva.org>
- new version 4.5.1
patch applied upstream
* Sun Mar 21 2010 Funda Wang <fwang@mandriva.org> 1:4.4-2mdv2010.1
+ Revision: 526037
- install libicutest
* Sat Mar 20 2010 Emmanuel Andry <eandry@mandriva.org> 1:4.4-1mdv2010.1
+ Revision: 525429
- New version 4.4
- New major 44
- rediff p4
+ Funda Wang <fwang@mandriva.org>
- build 64 bits at first
* Mon Jan 11 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 1:4.2.1-2mdv2010.1
+ Revision: 489818
- Patch4: fix build
- really use 4.2.1 tarballs
* Sat Jul 25 2009 Frederik Himpe <fhimpe@mandriva.org> 1:4.2.1-1mdv2010.0
+ Revision: 399844
- update to new version 4.2.1
* Sun May 31 2009 Funda Wang <fwang@mandriva.org> 1:4.2-2mdv2010.0
+ Revision: 381588
- stil use fedora's icu-config
* Sun May 31 2009 Funda Wang <fwang@mandriva.org> 1:4.2-1mdv2010.0
+ Revision: 381575
- New version 4.2
+ Christophe Fergeau <cfergeau@mandriva.com>
- fix compilation with gcc 4.4
* Tue Jan 20 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 1:4.0.1-1mdv2009.1
+ Revision: 331791
- update to new version 4.0.1
* Sun Dec 21 2008 Oden Eriksson <oeriksson@mandriva.com> 1:4.0-3mdv2009.1
+ Revision: 316951
- fix build with -Werror=format-security (P3)
- rebuild
* Wed Jul 16 2008 Funda Wang <fwang@mandriva.org> 1:4.0-2mdv2009.0
+ Revision: 236515
- switch fedora's icu-config for the package's own icu-config breaks too much
* Fri Jul 04 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 1:4.0-1mdv2009.0
+ Revision: 231685
- enable epoch :(
- update to new version 4.0 (looks like the versioning has been broken, epoch needed ?)
- fix descriptions
- Patch1: enable build with strict-aliasing
- Patch2: add icu.pc
- add buildrequires on doxygen
- enable checks
- fix file list
+ Pixel <pixel@mandriva.com>
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
* Fri May 30 2008 Funda Wang <fwang@mandriva.org> 4.0.d01-1mdv2009.0
+ Revision: 213349
- New version 4.0.d01
* Sat Jan 26 2008 Funda Wang <fwang@mandriva.org> 3.8.1-2mdv2008.1
+ Revision: 158374
- fix CVE 2007-4770 and 4771
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
- kill re-definition of %%buildroot on Pixel's request
* Fri Dec 14 2007 Funda Wang <fwang@mandriva.org> 3.8.1-1mdv2008.1
+ Revision: 120061
- New version 3.8.1
* Tue Dec 11 2007 Marcelo Ricardo Leitner <mrl@mandriva.com> 3.8-2mdv2008.1
+ Revision: 117322
- Added patch setBreakType, which makes that method public, as OOo requires it
to be.
* Sat Oct 27 2007 Funda Wang <fwang@mandriva.org> 3.8-1mdv2008.1
+ Revision: 102667
- New version 3.8
- New major ( 36 -> 38 )
* Sat Sep 01 2007 Pascal Terjan <pterjan@mandriva.org> 3.6-4mdv2008.0
+ Revision: 77367
- Move icu-config to -devel package and fix it on x86_64
* Sun Jun 24 2007 Funda Wang <fwang@mandriva.org> 3.6-3mdv2008.0
+ Revision: 43594
- adopt to new devel package policy again
* Thu Jun 21 2007 Funda Wang <fwang@mandriva.org> 3.6-2mdv2008.0
+ Revision: 42306
- Really use correct tarball
* Wed Jun 20 2007 Funda Wang <fwang@mandriva.org> 3.6-1mdv2008.0
+ Revision: 41947
- correct tarball name
remove invalid directory
adopt to new develname
- New version
- Import icu
* Tue Jan 3 2006 Götz Waschk <waschk@mandriva.org> 3.4-2mdk
- drop devel package obsoletes
- drop prereq
- make the devel package installable
* Tue Jan 03 2006 Oden Eriksson <oeriksson@mandriva.com> 3.4-1mdk
- 3.4
- drop the upstream patch (P0)
- fix deps
- make it rpmbuildupdate aware
* Tue May 10 2005 Arnaud de Lorbeau <devel@mandriva.com> 3.2-2mdk
- Provides icu32-devel
* Tue May 10 2005 Arnaud de Lorbeau <devel@mandriva.com> 3.2-1mdk
- 3.2
* Mon Jun 7 2004 Götz Waschk <waschk@linux-mandrake.com> 2.8.d01-3mdk
- rebuild
* Fri Jun 04 2004 Marcel Pol <mpol@mandrake.org> 2.8.d01-2mdk
- rebuild
* Wed Dec 17 2003 Marcel Pol <mpol@mandrake.org> 2.8.d01-1mdk
- major is 28
- From Quel Qun <kelk1@hotmail.com>
- Mandrake package.

19
icu4c-3_8-setBreakType.patch → icu4c-49.1-setBreakType.patch
View file

@ -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.setBreakType 2012-04-05 22:46:08.000000000 +0200
+++ icu/source/common/unicode/rbbi.h 2007-12-11 08:30:02.000000000 -0500 +++ icu/source/common/unicode/rbbi.h 2012-04-07 19:18:41.629484616 +0200
@@ -581,6 +581,12 @@ public: @@ -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. + * Set the type of the break iterator.
+ * @internal + * @internal
+ */ + */
+ // <mrl> Must be public (OOo requirement)
+ virtual void setBreakType(int32_t type); + virtual void setBreakType(int32_t type);
protected: protected:
//======================================================================= //=======================================================================
@@ -612,12 +618,6 @@ protected: @@ -688,12 +693,6 @@ protected:
virtual int32_t getBreakType() const;
#endif #endif
/** - /**
- * Set the type of the break iterator. - * Set the type of the break iterator.
- * @internal - * @internal
- */ - */
- virtual void setBreakType(int32_t type); - virtual void setBreakType(int32_t type);
- -
- /** #ifndef U_HIDE_INTERNAL_API
/**
* Common initialization function, used by constructors and bufferClone. * Common initialization function, used by constructors and bufferClone.
* (Also used by DictionaryBasedBreakIterator::createBufferClone().)
* @internal

24
icu4c-4_8-CVE-2011-4599.diff
View file

@ -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;
}
}