From 481d8a31b8b6ee1e4e3d866bf6b5e219b722c1a3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 21 Jul 2012 09:51:16 +0200 Subject: [PATCH] icu: update to 49.1.2 (SONAME bump). --- common/shlibs | 14 +++++++------- srcpkgs/icu/icu-devel.template | 21 +++++++++------------ srcpkgs/icu/icu-libs.template | 9 +++------ srcpkgs/icu/icu.rshlibs | 6 +++--- srcpkgs/icu/template | 19 ++++++++++++------- 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/common/shlibs b/common/shlibs index d7493bc1d52..b0d1ac9b8c1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -443,13 +443,13 @@ libvhd.so.1.0 xen-4.1.2_1 libblktapctl.so.1.0 xen-4.1.2_1 libbabl-0.1.so.0 babl-0.1.10_1 libgegl-0.2.so.0 gegl-0.2.0_1 -libiculx.so.46 icu-libs-4.6.1_1 -libicule.so.46 icu-libs-4.6.1_1 -libicuio.so.46 icu-libs-4.6.1_1 -libicui18n.so.46 icu-libs-4.6.1_1 -libicudata.so.46 icu-libs-4.6.1_1 -libicutu.so.46 icu-libs-4.6.1_1 -libicuuc.so.46 icu-libs-4.6.1_1 +libiculx.so.49 icu-libs-49.1.2_1 +libicule.so.49 icu-libs-49.1.2_1 +libicuio.so.49 icu-libs-49.1.2_1 +libicui18n.so.49 icu-libs-49.1.2_1 +libicudata.so.49 icu-libs-49.1.2_1 +libicutu.so.49 icu-libs-49.1.2_1 +libicuuc.so.49 icu-libs-49.1.2_1 libaspell.so.15 aspell-0.60_1 libhunspell-1.2.so.0 hunspell-1.2.8_1 libenchant.so.1 enchant-1.4.2_1 diff --git a/srcpkgs/icu/icu-devel.template b/srcpkgs/icu/icu-devel.template index 2ca8d300833..1ddd3d2d70b 100644 --- a/srcpkgs/icu/icu-devel.template +++ b/srcpkgs/icu/icu-devel.template @@ -1,20 +1,17 @@ # Template file for 'icu-devel'. # -depends="libstdc++-devel icu" +noarch=yes +depends="libstdc++-devel icu>=$version" short_desc="${short_desc} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} ${DESTDIR}/usr/bin \ - ${DESTDIR}/usr/share/man/man1 - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/{icu,pkgconfig} ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/icu ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/bin/icu-config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/man/man1/icu-config* \ - ${DESTDIR}/usr/share/man/man1 +do_install() { + vmove usr/include usr + vmove usr/lib/icu usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/icu usr/share + vmove usr/bin/icu-config usr/bin + vmove "usr/share/man/man1/icu-config*" usr/share/man/man1 } diff --git a/srcpkgs/icu/icu-libs.template b/srcpkgs/icu/icu-libs.template index b04c91c78e9..851bca86c22 100644 --- a/srcpkgs/icu/icu-libs.template +++ b/srcpkgs/icu/icu-libs.template @@ -1,13 +1,10 @@ # Template file for 'icu-libs'. # -short_desc="${short_desc} (shared libs)" +short_desc="${short_desc} -- shared libs" long_desc="${long_desc} This package contains the shared libraries." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libicu* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/icu/icu.rshlibs b/srcpkgs/icu/icu.rshlibs index 087eb1b8d9a..a85a1196135 100644 --- a/srcpkgs/icu/icu.rshlibs +++ b/srcpkgs/icu/icu.rshlibs @@ -1,7 +1,7 @@ -libicutu.so.46 libc.so.6 -libicuuc.so.46 libstdc++.so.6 libgcc_s.so.1 -libicui18n.so.46 libpthread.so.0 +libicutu.so.49 +libicuuc.so.49 +libicui18n.so.49 diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index a45b5e9196c..83811987d20 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -1,14 +1,18 @@ # Template build file for 'icu'. pkgname=icu -version=4.6.1 -wrksrc=$pkgname +version=49.1.2 +_distver="$(echo $version|sed -e 's|\.|_|g')" +revision=1 +wrksrc=icu build_wrksrc=source -distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-4_6_1-src.tgz" build_style=gnu-configure -revision=2 +subpackages="icu-devel icu-libs" short_desc="Robust and full-featured Unicode services" maintainer="Juan RP " -checksum=6846b5e67bea5cb7f5c4b0208489498a9b14bc34f2d556cc5a99209038644874 +homepage="http://www.icu-project.org/" +license="ICU License /usr/share/licenses/icu/license.html" +distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${_distver}-src.tgz" +checksum=cce83cc88a2ff79d65c05426facbf30530bbe13a1cfda04b3ab81b55414cf5a3 long_desc=" The International Components for Unicode(ICU) is a C and C++ library that provides robust and full-featured Unicode support on a wide variety of @@ -27,5 +31,6 @@ long_desc=" - Transliteration - Word, line and sentence breaks" -subpackages="$pkgname-devel $pkgname-libs" - +post_install() { + vinstall $wrksrc/license.html 644 usr/share/licenses/icu +}