rpms/icu/EL-4 icu-3.4-multiarchdevel.patch, NONE, 1.1 icu-config, NONE, 1.1 icu.icu5365.dependantvowels.patch, NONE, 1.1 icu.icu5418.malayam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 icu.spec, 1.1, 1.2 sources, 1.2, 1.3
Thorsten Leemhuis (thl)
fedora-extras-commits at redhat.com
Mon Dec 4 18:11:28 UTC 2006
- Previous message (by thread): rpms/gmime/EL-4 gmime-2.2.1-use-pkg-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gmime.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/mail-notification/EL-4 mail-notification.spec,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thl
Update of /cvs/extras/rpms/icu/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096
Modified Files:
.cvsignore icu.spec sources
Added Files:
icu-3.4-multiarchdevel.patch icu-config
icu.icu5365.dependantvowels.patch icu.icu5418.malayam.patch
Log Message:
3.6-4 -- sync with core
icu-3.4-multiarchdevel.patch:
--- NEW FILE icu-3.4-multiarchdevel.patch ---
--- icu/source/configure.in.orig 2006-05-02 12:10:31.000000000 +0100
+++ icu/source/configure.in 2006-05-02 15:06:07.000000000 +0100
@@ -1011,6 +1011,7 @@
Makefile \
data/icupkg.inc \
config/Makefile.inc \
+ config/icu.pc \
data/Makefile \
stubdata/Makefile \
common/Makefile \
--- /dev/null 2006-04-29 13:38:37.035974750 +0100
+++ icu/source/config/icu.pc.in 2006-05-02 15:03:14.000000000 +0100
@@ -0,0 +1,46 @@
+prefix = @prefix@
+bindir = @bindir@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+includedir = @includedir@
+datadir = @datadir@
+sbindir = @sbindir@
+mandir = @mandir@
+sysconfdir = @sysconfdir@
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+DEFS = @DEFS@
+UNICODE_VERSION=@UNICODE_VERSION@
+ICUPREFIX=icu
+ICULIBSUFFIX=@ICULIBSUFFIX@
+LIBICU=lib${ICUPREFIX}
+LIBCPPFLAGS=-D_REENTRANT
+CPPFLAGS=@CPPFLAGS@ ${LIBCPPFLAGS} -I${prefix}/include
+SHAREDLIBCPPFLAGS=-DPIC
+SHAREDLIBCXXFLAGS=-fPIC
+SHAREDLIBCFLAGS=-fPIC
+pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@
+pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@
+ICUDATA_NAME = icudt at LIB_VERSION_MAJOR@@ICUDATA_CHAR@
+ICUPKGDATA_DIR=@libdir@
+ICUDATA_DIR=${pkgdatadir}
+SO=so
+ICULIBS_COMMON_LIB_NAME=${LIBICU}uc${ICULIBSUFFIX}.${SO}
+SHLIB_cc=cxx ${DEFS} ${CPPFLAGS} ${CXXFLAGS} @LDFLAGS@ -shared
+SHLIB_c=cc ${DEFS} ${CPPFLAGS} ${CFLAGS} @LDFLAGS@ -shared
+ICULIBS_LAYOUT = -l${ICUPREFIX}le${ICULIBSUFFIX} -l${ICUPREFIX}lx${ICULIBSUFFIX}
+ICULIBS_TOOLUTIL = -l${ICUPREFIX}tu${ICULIBSUFFIX}
+ICULIBS_OBSOLETE = -l${ICUPREFIX}obsolete${ICULIBSUFFIX}
+ICULIBS_ICUIO = -l${ICUPREFIX}io${ICULIBSUFFIX}
+ICULIBS_I18N = -l${ICUPREFIX}i18n${ICULIBSUFFIX}
+ICULIBS_COMMON = -l${ICUPREFIX}uc${ICULIBSUFFIX}
+ICULIBS_DATA = -l${ICUPREFIX}data${ICULIBSUFFIX}
+ICULIBS_LIBSONLY = ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}
+ICULIBS_SYSTEMLIBS = @LIBS@
+ICULIBS_BASE = @LIBS@ -L${libdir}
+ICULIBS = ${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}
+
+Name: @PACKAGE@
+Description: International Components for Unicode
+Version: @VERSION@
+Libs: @LDFLAGS@ ${ICULIBS} @LIBS@
--- icu/source/Makefile.in.orig 2006-05-02 12:10:31.000000000 +0100
+++ icu/source/Makefile.in 2006-05-02 15:18:15.000000000 +0100
@@ -125,6 +125,8 @@
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
+ @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
+ $(INSTALL_DATA) $(top_srcdir)/config/icu.pc $(DESTDIR)$(libdir)/pkgconfig/icu.pc
$(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html
$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
$(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc
--- NEW FILE icu-config ---
#!/bin/sh
## -*-sh-*-
#set -x
# BEGIN of icu-config-top
#******************************************************************************
# Copyright (C) 1999-2004, International Business Machines
# Corporation and others. All Rights Reserved.
#******************************************************************************
# This script is designed to aid configuration of ICU.
# rpath links a library search path right into the binaries.
### END of icu-config-top
## Zero out prefix.
exec_prefix=`pkg-config --variable=exec_prefix icu`
execprefix=$exec_prefix
prefix=`pkg-config --variable=prefix icu`
loaddefs()
{
LDLIBRARYPATH_ENVVAR="LD_LIBRARY_PATH"
bindir=`pkg-config --variable=bindir icu`
sbindir=`pkg-config --variable=sbindir icu`
libdir=`pkg-config --variable=libdir icu`
sysconfdir=`pkg-config --variable=sysconfdir icu`
mandir=`pkg-config --variable=mandir icu`
datadir=`pkg-config --variable=datadir icu`
pkglibdir=`pkg-config --variable=pkglibdir icu`
ICULIBS_COMMON_LIB_NAME=`pkg-config --variable=ICULIBS_COMMON_LIB_NAME icu`
UNICODE_VERSION=`pkg-config --variable=UNICODE_VERSION icu`
VERSION=`pkg-config --modversion icu`
SO=`pkg-config --variable=SO icu`
## -*-sh-*-
## BEGIN of icu-config-bottom.
## Copyright (c) 2002-2004, International Business Machines Corporation and
## others. All Rights Reserved.
ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME}
# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
if [ "x$PKGDATA_MODE" = "x" ]; then
PKGDATA_MODE=dll
fi
}
## The actual code of icu-config goes here.
ME=`basename $0`
allflags()
{
echo " --bindir Print binary directory path (bin)"
echo " --cc Print C compiler used [CC]"
echo " --cflags Print C compiler flags [CFLAGS]"
echo " --cflags-dynamic Print additional C flags for"
echo " building shared libraries."
echo " --cppflags Print C Preprocessor flags [CPPFLAGS]"
echo " --cppflags-dynamic Print additional C Preprocessor flags for"
echo " building shared libraries."
echo " --cppflags-searchpath Print only -I include directives (-Iinclude)"
echo " --cxx Print C++ compiler used [CXX]"
echo " --cxxflags Print C++ compiler flags [CXXFLAGS]"
echo " --cxxflags-dynamic Print additional C++ flags for"
echo " building shared libraries."
echo " --detect-prefix Attempt to detect prefix based on PATH"
echo " --exec-prefix Print prefix for executables (/bin)"
echo " --exists Return with 0 status if ICU exists else fail"
echo " --help, -?, --usage Print this message"
echo " --icudata Print shortname of ICU data file (icudt21l)"
echo " --icudata-install-dir Print path to install data to - use as --install option to pkgdata(1)"
echo " --icudata-mode Print default ICU pkgdata mode (dll) - use as --mode option to pkgdata(1)."
echo " --icudatadir Print path to packaged archive data. Can set as [ICU_DATA]"
echo " --invoke Print commands to invoke an ICU program"
echo " --invoke=<prog> Print commands to invoke an ICU program named <prog> (ex: genrb)"
echo " --ldflags Print -L search path and -l libraries to link with ICU [LDFLAGS]. This is for the data, uc (common), and i18n libraries only. "
echo " --ldflags-layout Print ICU layout engine link directive. Use in addition to --ldflags"
echo " --ldflags-libsonly Same as --ldflags, but only the -l directives"
echo " --ldflags-searchpath Print only -L (search path) directive"
echo " --ldflags-system Print only system libs ICU links with (-lpthread, -lm)"
echo " --ldflags-icuio Print ICU icuio link directive. Use in addition to --ldflags "
echo " --ldflags-obsolete Print ICU obsolete link directive. Use in addition to --ldflags. (requires icuapps/obsolete to be built and installed.) "
echo " --mandir Print manpage (man) path"
echo " --prefix Print PREFIX to icu install (/usr/local)"
echo " --prefix=XXX Set prefix to XXX for remainder of command"
echo " --sbindir Print system binary path (sbin) "
echo " --shared-datadir Print shared data (share) path. This is NOT the ICU data dir."
echo " --shlib-c Print the command to compile and build C shared libraries with ICU"
echo " --shlib-cc Print the command to compile and build C++ shared libraries with ICU"
echo " --sysconfdir Print system config (etc) path"
echo " --unicode-version Print version of Unicode data used in ICU ($UNICODE_VERSION)"
echo " --version Print ICU version ($VERSION)"
echo " --incfile Print path to Makefile.inc (for -O option of pkgdata)"
}
## Print the normal usage message
shortusage()
{
echo "usage: ${ME} " `allflags | cut -c-25 | sed -e 's%.*%[ & ]%'`
}
usage()
{
echo "${ME}: icu-config: ICU configuration helper script"
echo
echo "The most commonly used options will be --cflags, --cxxflags, --cppflags, and --ldflags."
echo 'Example (in make): CPFLAGS=$(shell icu-config --cppflags)'
echo ' LDFLAGS=$(shell icu-config --ldflags)'
echo " (etc).."
echo
echo "Usage:"
allflags
echo
echo " [Brackets] show MAKE variable equivalents, (parenthesis) show example output"
echo
echo "Copyright (c) 2002, International Business Machines Corporation and others. All Rights Reserved."
}
## Check the sanity of current variables
sanity()
{
if [ ! -f ${ICUUC_FILE} ];
then
echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2
echo "### Try the --prefix= or --exec-prefix= options " 1>&2
echo "### or --detect-prefix"
echo "### $ME: Exitting." 1>&2
exit 2
fi
}
## Main starts here.
if [ $# -lt 1 ]; then
shortusage
exit 1
fi
# Load our variables from autoconf
# ALWAYS load twice because of dependencies
loaddefs
loaddefs
sanity
while [ $# -gt 0 ];
do
arg="$1"
var=`echo $arg | sed -e 's/^[^=]*=//'`
# echo "### processing $arg" 1>&2
case "$arg" in
# undocumented.
--debug)
set -x
;;
--so)
echo $SO
;;
--bindir)
echo $bindir
;;
--libdir)
echo $libdir
;;
--exists)
sanity
;;
--sbindir)
echo $sbindir
;;
--invoke=*)
QUOT="'"
CMD="${var}"
# If it's not a locally executable command (1st choice) then
# search for it in the ICU directories.
if [ ! -x ${CMD} ]; then
if [ -x ${bindir}/${var} ]; then
CMD="${bindir}/${var}"
fi
if [ -x ${sbindir}/${var} ]; then
CMD="${sbindir}/${var}"
fi
fi
echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT} ${CMD}
;;
--invoke)
QUOT="'"
echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT}
;;
--cflags)
pkg-config --variable=CFLAGS icu
;;
--cc)
echo cc
;;
--cxx)
echo c++
;;
--cxxflags)
pkg-config --variable=CXXFLAGS icu
;;
--cppflags)
# Don't echo the -I. - it's unneeded.
CPPFLAGS=`pkg-config --variable=CPPFLAGS icu`
echo $CPPFLAGS | sed -e 's/-I. //'
;;
--cppflags-searchpath)
echo -I${prefix}/include
;;
--cppflags-dynamic)
pkg-config --variable=SHAREDLIBCPPFLAGS icu
;;
--cxxflags-dynamic)
pkg-config --variable=SHAREDLIBCXXFLAGS icu
;;
--cflags-dynamic)
pkg-config --variable=SHAREDLIBCFLAGS icu
;;
--ldflags-system)
pkg-config --variable=ICULIBS_SYSTEMLIBS icu
;;
--ldflags)
pkg-config --libs icu
# $RPATH_LDFLAGS
;;
--ldflags-libsonly)
pkg-config --variable=ICULIBS_LIBSONLY icu
;;
--ldflags-icuio)
pkg-config --variable=ICULIBS_ICUIO icu
;;
--ldflags-obsolete)
pkg-config --variable=ICULIBS_OBSOLETE icu
;;
--ldflags-toolutil)
pkg-config --variable=ICULIBS_TOOLUTIL icu
;;
--ldflags-layout)
pkg-config --variable=ICULIBS_LAYOUT icu
;;
--ldflags-searchpath)
echo -L${libdir}
;;
--detect-prefix)
HERE=`echo $0 | sed -e "s/$ME//g"`
if [ -f $HERE/../lib/${ICULIBS_COMMON_LIB_NAME} ]; then
prefix=$HERE/..
echo "## Using --prefix=${prefix}" 1>&2
fi
loaddefs
loaddefs
sanity
;;
--exec-prefix)
echo $exec_prefix
;;
--prefix)
echo $prefix
;;
--prefix=*)
prefix=$var
loaddefs
loaddefs
sanity
;;
--sysconfdir)
echo $sysconfdir
;;
--mandir)
echo $mandir
;;
--shared-datadir)
echo $datadir
;;
--incfile)
echo $pkglibdir/Makefile.inc
;;
--icudata)
pkg-config --variable=ICUDATA_NAME icu
;;
--icudata-mode)
echo $PKGDATA_MODE
;;
--icudata-install-dir)
pkg-config --variable=ICUPKGDATA_DIR icu
;;
--icudatadir)
pkg-config --variable=ICUDATA_DIR icu
;;
--shlib-c)
pkg-config --variable=SHLIB_c icu
;;
--shlib-cc)
pkg-config --variable=SHLIB_cc icu
;;
--version)
echo $VERSION
;;
--unicode-version)
echo $UNICODE_VERSION
;;
--help)
usage
exit 0
;;
--usage)
usage
exit 0
;;
# --enable-rpath=*)
# ENABLE_RPATH=$var
# loaddefs
# ;;
-?)
usage
exit 0
;;
*)
echo ${ME}: ERROR Unknown Option $arg 1>&2
echo 1>&2
shortusage 1>&2
echo "### $ME: Exitting." 1>&2
exit 1;
;;
esac
shift
done
# Check once before we quit (will check last used prefix)
sanity
## END of icu-config-bottom
exit 0
icu.icu5365.dependantvowels.patch:
--- NEW FILE icu.icu5365.dependantvowels.patch ---
--- icu/source/layout/IndicReordering.cpp.orig 2006-09-05 17:01:15.000000000 +0100
+++ icu/source/layout/IndicReordering.cpp 2006-09-05 17:01:19.000000000 +0100
@@ -377,7 +377,7 @@
{-1, 6, 1, -1, -1, -1, -1, -1, -1, 5, 9, 5, 5, 4, 12}, // 2 - consonant with nukta
{-1, 6, 1, -1, -1, -1, -1, -1, 2, 5, 9, 5, 5, 4, 12}, // 3 - consonant
{-1, -1, -1, -1, -1, -1, 3, 2, -1, -1, -1, -1, -1, -1, 7}, // 4 - consonant virama
- {-1, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // 5 - dependent vowels
+ {-1, 6, 1, -1, -1, -1, -1, -1, -1, 5, -1, -1, -1, -1, -1}, // 5 - dependent vowels
{-1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // 6 - vowel mark
{-1, -1, -1, -1, -1, -1, 3, 2, -1, -1, -1, -1, -1, -1, -1}, // 7 - consonant virama ZWJ, consonant ZWJ virama
{-1, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1}, // 8 - independent vowels that can take a virama
icu.icu5418.malayam.patch:
--- NEW FILE icu.icu5418.malayam.patch ---
--- icu/source/layout/IndicClassTables.cpp.orig 2006-08-23 01:12:40.000000000 +0100
+++ icu/source/layout/IndicClassTables.cpp 2006-09-25 09:06:38.000000000 +0100
@@ -173,6 +173,19 @@
_iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0CE0 - 0CEF
};
+#if 1
+//use the pango char class table here
+static const IndicClassTable::CharClass mlymCharClasses[] =
+{
+ _xx, _xx, _mp, _mp, _xx, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _iv, _xx, _iv, _iv, /* 0D00 - 0D0F */
+ _iv, _xx, _iv, _iv, _iv, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, /* 0D10 - 0D1F */
+ _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _ct, _xx, _ct, _ct, _ct, _ct, _ct, _pb, /* 0D20 - 0D2F */
+ _pb, _cn, _ct, _ct, _ct, _pb, _ct, _ct, _ct, _ct, _xx, _xx, _xx, _xx, _dr, _dr, /* 0D30 - 0D3F */
+ _dr, _dr, _dr, _dr, _xx, _xx, _dl, _dl, _dl, _xx, _s1, _s2, _s3, _vr, _xx, _xx, /* 0D40 - 0D4F */
+ _xx, _xx, _xx, _xx, _xx, _xx, _xx, _dr, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, /* 0D50 - 0D5F */
+ _iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx /* 0D60 - 0D6F */
+};
+#else
// FIXME: this is correct for old-style Malayalam (MAL) but not for reformed Malayalam (MLR)
// FIXME: should there be a REPH for old-style Malayalam?
static const IndicClassTable::CharClass mlymCharClasses[] =
@@ -185,6 +198,7 @@
_xx, _xx, _xx, _xx, _xx, _xx, _xx, _m2, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, // 0D50 - 0D5F
_iv, _iv, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx // 0D60 - 0D6F
};
+#endif
static const IndicClassTable::CharClass sinhCharClasses[] =
{
@@ -232,7 +246,7 @@
#define TAML_SCRIPT_FLAGS (SF_MPRE_FIXUP | SF_NO_POST_BASE_LIMIT | SF_FILTER_ZERO_WIDTH)
#define TELU_SCRIPT_FLAGS (SF_MATRAS_AFTER_BASE | SF_FILTER_ZERO_WIDTH | 3)
#define KNDA_SCRIPT_FLAGS (SF_MATRAS_AFTER_BASE | SF_FILTER_ZERO_WIDTH | 3)
-#define MLYM_SCRIPT_FLAGS (SF_MPRE_FIXUP | SF_NO_POST_BASE_LIMIT | SF_FILTER_ZERO_WIDTH)
+#define MLYM_SCRIPT_FLAGS (SF_MPRE_FIXUP | SF_NO_POST_BASE_LIMIT)
#define SINH_SCRIPT_FLAGS (SF_MPRE_FIXUP | SF_NO_POST_BASE_LIMIT)
//
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icu/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Jan 2005 12:37:35 -0000 1.2
+++ .cvsignore 4 Dec 2006 18:10:58 -0000 1.3
@@ -1 +1 @@
-icu-3.2.tgz
+icu4c-3_6-src.tgz
Index: icu.spec
===================================================================
RCS file: /cvs/extras/rpms/icu/EL-4/icu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu.spec 1 Jan 2005 12:37:35 -0000 1.1
+++ icu.spec 4 Dec 2006 18:10:58 -0000 1.2
@@ -1,22 +1,19 @@
-# Notes:
-# - According to upstream, icu may trigger a gcc bug with -O2 which manifests
-# itself as failure in data/locales/ja.txt. This does not seem to occur
-# any more with icu 3.0 and gcc 3.3.[23], but in case it resurfaces, see
-# source/runConfigureICU for the upstream recommended C(XX)FLAGS
-# (-O3 and -O as of 3.0) and force use of them in the build section.
-
Name: icu
-Version: 3.2
-Release: 1
+Version: 3.6
+Release: 4%{dist}
Summary: International Components for Unicode
-Group: Applications/Text
+Group: System Environment/Libraries
License: X License
-URL: http://oss.software.ibm.com/icu/
-Source: ftp://www-126.ibm.com/pub/icu/3.2/icu-3.2.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: doxygen graphviz
+URL: http://www.ibm.com/software/globalization/icu/
+Source0: ftp://ftp.software.ibm.com/software/globalization/icu/icu4c-3_6-src.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: doxygen, autoconf
+Patch1: icu-3.4-multiarchdevel.patch
+Patch2: icu-config
+Patch3: icu.icu5365.dependantvowels.patch
+Patch4: icu.icu5418.malayam.patch
%description
The International Components for Unicode (ICU) libraries provide
@@ -55,23 +52,28 @@
%prep
%setup -q -n %{name}
-find . -name CVS -o -name .cvsignore | xargs -r rm -rf
-%{__perl} -pi -e 's/^(HAVE_DOT\b.*=).*$/$1 YES/' source/Doxyfile.in
-
+%patch1 -p1 -b .multiarchdevel
+%patch3 -p1 -b .dependantvowels
+%patch4 -p1 -b .malayam.patch
%build
cd source
-%configure --enable-static --with-data-packaging=library --disable-samples
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+autoconf
+%configure --with-data-packaging=library --disable-samples
make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
make doc
-
%install
rm -rf $RPM_BUILD_ROOT source/__docs
make -C source install DESTDIR=$RPM_BUILD_ROOT
make -C source install-doc docdir=__docs
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
-
+cp %{PATCH2} $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
+sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
%check || :
make -C source check
@@ -92,6 +94,7 @@
%{_bindir}/derb
%{_bindir}/genbrk
%{_bindir}/gencnval
+%{_bindir}/genctd
%{_bindir}/genrb
%{_bindir}/makeconv
%{_bindir}/pkgdata
@@ -100,6 +103,8 @@
%{_mandir}/man1/derb.1*
%{_mandir}/man1/gencnval.1*
%{_mandir}/man1/genrb.1*
+%{_mandir}/man1/genbrk.1*
+%{_mandir}/man1/genctd.1*
%{_mandir}/man1/makeconv.1*
%{_mandir}/man1/pkgdata.1*
%{_mandir}/man1/uconv.1*
@@ -115,14 +120,14 @@
%{_mandir}/man1/%{name}-config.1*
%{_includedir}/layout
%{_includedir}/unicode
-%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/%{name}
+%{_libdir}/pkgconfig/icu.pc
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/%{version}
-%{_datadir}/%{name}/%{version}/mkinstalldirs
-%{_datadir}/%{name}/%{version}/config
-%doc %{_datadir}/%{name}/%{version}/license.html
+%dir %{_datadir}/%{name}/3.6
+%{_datadir}/%{name}/3.6/mkinstalldirs
+%{_datadir}/%{name}/3.6/config
+%doc %{_datadir}/%{name}/3.6/license.html
%files -n lib%{name}-doc
%defattr(-,root,root,-)
@@ -130,6 +135,83 @@
%changelog
+* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 3.6-4
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Sep 25 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-3
+- rh#206615# render malayam like pango
+
+* Wed Sep 06 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-2
+- fix rh#205252#/icu#5365 (gnome#121882#/#icu#4026#) to make icu
+ like pango for multiple dependant vowels
+
+* Mon Sep 03 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-1
+- final release
+
+* Mon Aug 14 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.1.d02
+- bump
+
+* Tue Aug 08 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.2.d01
+- c++ code not alias correct
+
+* Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 3.6-0.1.d01
+- rh#200728# update to prelease 3.6d01 to pick up on sinhala fixes
+- drop integrated rh190879.patch
+- drop integrated icu-3.4-sinhala1.patch
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-10.1.1
+- rebuild
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-10.1
+- rebuild
+
+* Sat Jun 10 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-10
+- rh#194686# BuildRequires
+
+* Tue May 09 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-9
+- rh#190879# backport fix
+
+* Wed May 03 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-8
+- add Harshula's icu-3.4-sinhala1.patch for some Sinhala support
+
+* Tue May 02 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-7
+- add a pkgconfig.pc, make icu-config use it
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4-6.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.4-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-6
+- add icu-gcc41.patch
+
+* Tue Oct 11 2005 Caolan McNamara <caolanm at redhat.com> - 3.4-5
+- clear execstack requirement for libicudata
+
+* Mon Sep 12 2005 Caolan McNamara <caolanm at redhat.com> - 3.4-4
+- import extra icu.spec into fedora core for openoffice.org
+- build with gcc 4
+
+* Wed Aug 31 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 3.4-3
+- Use dist
+- gcc32 does not understand -fstack-protector and
+ --param=ssp-buffer-size=4
+
+* Tue Aug 2 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.4-2
+- 3.4.
+
+* Sun Jul 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.4-0.2.d02
+- 3.4-d02.
+- Don't ship static libraries.
+
+* Wed Apr 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.2-3
+- Apply upstream case mapping mutex lock removal patch.
+- Build with gcc 3.2 as a temporary workaround for #152495.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.2-2
+- rebuilt
+
* Sat Jan 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.2-1
- Don't use %%{_smp_mflags} (b.f.u #2357).
- Remove unnecessary Epochs.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icu/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Jan 2005 12:37:35 -0000 1.2
+++ sources 4 Dec 2006 18:10:58 -0000 1.3
@@ -1 +1 @@
-55a85d2365338ece483d275119fd990c icu-3.2.tgz
+6243f7a19e03e05403ce84e597510d4c icu4c-3_6-src.tgz
- Previous message (by thread): rpms/gmime/EL-4 gmime-2.2.1-use-pkg-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gmime.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/mail-notification/EL-4 mail-notification.spec,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list