diff --git a/.abf.yml b/.abf.yml index 24d3db4..e35db0d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - "icu4c-49_1_1-docs.zip": c9fcd1571cdfe5848d1336841624b3b92d259cb6 - "icu4c-49_1_1-src.tgz": f407d7e2808b76e3a6ca316aab896aef74bf6722 + icu4c-53_1-docs.zip: 1a4bbeef968f592decde2844617fa41eea1b93c6 + icu4c-53_1-src.tgz: 7eca017fdd101e676d425caaf28ef862d3655e0f diff --git a/icu.spec b/icu.spec index dab8422..db75d66 100644 --- a/icu.spec +++ b/icu.spec @@ -1,4 +1,4 @@ -%define major %(echo %version |cut -d. -f1) +%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} @@ -7,22 +7,22 @@ %define libicutest %mklibname %{name}test %{major} %define libicutu %mklibname %{name}tu %{major} %define libicuuc %mklibname %{name}uc %{major} -%define develname %mklibname %{name} -d +%define devname %mklibname %{name} -d -%define tarballver %(echo %version|sed -e 's|\\.|_|g') +%define tarballver %(echo %{version}|sed -e 's|\\.|_|g') +%bcond_with crosscompile Summary: International Components for Unicode Name: icu Epoch: 1 -Version: 49.1.1 -Release: 2 +Version: 53.1 +Release: 1 License: MIT 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 Source1: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{tarballver}-docs.zip Patch0: %{name}4c-49.1-setBreakType.patch -Patch6: icu-4.6.1-do-not-promote-ldflags.patch BuildRequires: doxygen %description @@ -61,6 +61,7 @@ Documentation for the International Components for Unicode. %package -n %{libicudata} Summary: Library for the International Components for Unicode - icudata Group: System/Libraries +Obsoletes: %{mklibname icu 44} <= 4.4.2 %description -n %{libicudata} Library for the International Components for Unicode - icudata. @@ -114,7 +115,7 @@ Group: System/Libraries %description -n %{libicuuc} Library for the International Components for Unicode - icuuc. -%package -n %{develname} +%package -n %{devname} Summary: Development files for the International Components for Unicode Group: Development/Other Requires: %{libicudata} >= %{EVRD} @@ -127,19 +128,14 @@ 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 -%description -n %{develname} +%description -n %{devname} Development files and headers for the International Components for Unicode. %prep -%setup -q -n %{name} +%setup -qn %{name} %patch0 -p1 -b .setBreakType -%patch6 -p0 -b .ldflags mkdir -p docs cd docs @@ -151,10 +147,22 @@ pushd source # (tpg) needed for patch 2 export CFLAGS='%{optflags} -fno-strict-aliasing' export CXXFLAGS='%{optflags} -fno-strict-aliasing' +# If we want crosscompile icu we need to built ICU package +# and add --with-cross-build=/path/to/icu +# disable bits and do unset TARGET twice, after configure +# and before makeinstall %configure2_5x \ +%if !%{with crosscompile} --with-library-bits=64else32 \ +%endif --with-data-packaging=library \ +%if %{with crosscompile} + --with-cross-build=/path/to/built/icu/source/ \ +%endif --disable-samples +%if %{with crosscompile} +unset TARGET +%endif %make %make doc popd @@ -165,10 +173,10 @@ make check popd %install -rm -rf %{buildroot} -pushd source -%makeinstall_std -popd +%if %{with crosscompile} +unset TARGET +%endif +%makeinstall_std -C source %files %{_bindir}/* @@ -204,7 +212,7 @@ popd %files -n %{libicuuc} %{_libdir}/libicuuc.so.%{major}* -%files -n %{develname} +%files -n %{devname} %{_bindir}/icu-config %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -217,190 +225,3 @@ popd %dir %{_datadir}/%{name} %{_datadir}/%{name}/* - -%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 - -* Sun Jun 05 2011 Funda Wang 1:4.8-1 -+ Revision: 682800 -- new version 4.8 - -* Wed May 04 2011 Oden Eriksson 1:4.6.1-3 -+ Revision: 665501 -- mass rebuild - -* Mon Mar 14 2011 Funda Wang 1:4.6.1-2 -+ Revision: 644587 -- do not promote ldflags in icu-config - -* Mon Mar 14 2011 Funda Wang 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 1:4.4.2-1mdv2011.0 -+ Revision: 582874 -- new version 4.4.2 - -* Sat Jul 31 2010 Funda Wang 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 - - new version 4.5.1 - patch applied upstream - -* Sun Mar 21 2010 Funda Wang 1:4.4-2mdv2010.1 -+ Revision: 526037 -- install libicutest - -* Sat Mar 20 2010 Emmanuel Andry 1:4.4-1mdv2010.1 -+ Revision: 525429 -- New version 4.4 -- New major 44 -- rediff p4 - - + Funda Wang - - build 64 bits at first - -* Mon Jan 11 2010 Tomasz Pawel Gajc 1:4.2.1-2mdv2010.1 -+ Revision: 489818 -- Patch4: fix build -- really use 4.2.1 tarballs - -* Sat Jul 25 2009 Frederik Himpe 1:4.2.1-1mdv2010.0 -+ Revision: 399844 -- update to new version 4.2.1 - -* Sun May 31 2009 Funda Wang 1:4.2-2mdv2010.0 -+ Revision: 381588 -- stil use fedora's icu-config - -* Sun May 31 2009 Funda Wang 1:4.2-1mdv2010.0 -+ Revision: 381575 -- New version 4.2 - - + Christophe Fergeau - - fix compilation with gcc 4.4 - -* Tue Jan 20 2009 Tomasz Pawel Gajc 1:4.0.1-1mdv2009.1 -+ Revision: 331791 -- update to new version 4.0.1 - -* Sun Dec 21 2008 Oden Eriksson 1:4.0-3mdv2009.1 -+ Revision: 316951 -- fix build with -Werror=format-security (P3) -- rebuild - -* Wed Jul 16 2008 Funda Wang 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 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 - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Fri May 30 2008 Funda Wang 4.0.d01-1mdv2009.0 -+ Revision: 213349 -- New version 4.0.d01 - -* Sat Jan 26 2008 Funda Wang 3.8.1-2mdv2008.1 -+ Revision: 158374 -- fix CVE 2007-4770 and 4771 - - + Olivier Blin - - restore BuildRoot - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - -* Fri Dec 14 2007 Funda Wang 3.8.1-1mdv2008.1 -+ Revision: 120061 -- New version 3.8.1 - -* Tue Dec 11 2007 Marcelo Ricardo Leitner 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 3.8-1mdv2008.1 -+ Revision: 102667 -- New version 3.8 -- New major ( 36 -> 38 ) - -* Sat Sep 01 2007 Pascal Terjan 3.6-4mdv2008.0 -+ Revision: 77367 -- Move icu-config to -devel package and fix it on x86_64 - -* Sun Jun 24 2007 Funda Wang 3.6-3mdv2008.0 -+ Revision: 43594 -- adopt to new devel package policy again - -* Thu Jun 21 2007 Funda Wang 3.6-2mdv2008.0 -+ Revision: 42306 -- Really use correct tarball - -* Wed Jun 20 2007 Funda Wang 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 3.4-2mdk -- drop devel package obsoletes -- drop prereq -- make the devel package installable - -* Tue Jan 03 2006 Oden Eriksson 3.4-1mdk -- 3.4 -- drop the upstream patch (P0) -- fix deps -- make it rpmbuildupdate aware - -* Tue May 10 2005 Arnaud de Lorbeau 3.2-2mdk -- Provides icu32-devel - -* Tue May 10 2005 Arnaud de Lorbeau 3.2-1mdk -- 3.2 - -* Mon Jun 7 2004 Götz Waschk 2.8.d01-3mdk -- rebuild - -* Fri Jun 04 2004 Marcel Pol 2.8.d01-2mdk -- rebuild - -* Wed Dec 17 2003 Marcel Pol 2.8.d01-1mdk -- major is 28 -- From Quel Qun - - Mandrake package.