rpms/icu/devel .cvsignore,1.2,1.3 icu.spec,1.2,1.3 sources,1.2,1.3

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/icu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21301

Modified Files:
	.cvsignore icu.spec sources 
Log Message:
Apply upstream case mapping mutex lock removal patch, build with gcc 3.2
as a temporary workaround for #152495.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icu/devel/.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	15 May 2005 18:08:49 -0000	1.3
@@ -1 +1,2 @@
 icu-3.2.tgz
+icu-3.2-patch.tgz


Index: icu.spec
===================================================================
RCS file: /cvs/extras/rpms/icu/devel/icu.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icu.spec	6 Apr 2005 22:12:02 -0000	1.2
+++ icu.spec	15 May 2005 18:08:49 -0000	1.3
@@ -1,23 +1,21 @@
-# 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.
+%define gcc32 1
 
 Name:           icu
 Version:        3.2
-Release:        2
-
+Release:        3
 Summary:        International Components for Unicode
 
 Group:          Applications/Text
 License:        X License
-URL:            http://oss.software.ibm.com/icu/
-Source:         ftp://www-126.ibm.com/pub/icu/3.2/icu-3.2.tgz
+URL:            http://www.ibm.com/software/globalization/icu/
+Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/%{name}-%{version}.tgz
+Source1:        ftp://ftp.software.ibm.com/software/globalization/icu/3.2/icu-3.2-patch.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen graphviz
+%if %{gcc32}
+BuildRequires:  compat-gcc-32-c++
+%endif
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -55,13 +53,18 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name} -a 1
+%{__patch} -p0 < icu-3.2-patch
 find . -name CVS -o -name .cvsignore | xargs -r rm -rf
 %{__perl} -pi -e 's/^(HAVE_DOT\b.*=).*$/$1 YES/' source/Doxyfile.in
 
 
 %build
 cd source
+%if %{gcc32}
+%{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)}
+export CC=gcc32 CXX=g++32
+%endif
 %configure --enable-static --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
@@ -131,7 +134,11 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icu/devel/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	15 May 2005 18:08:49 -0000	1.3
@@ -1 +1,2 @@
 55a85d2365338ece483d275119fd990c  icu-3.2.tgz
+304f6cb1659967c7fbdeebca4f9c0e39  icu-3.2-patch.tgz