From a34af077ee01460b89f923ddaf2ddddc088db396ee691fc7d7f47178eb4bd709 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Thu, 13 Oct 2011 17:42:05 +0000
Subject: [PATCH] Accepting request 87732 from GNOME:Factory

Resubmitting, with a comment after discussion on #opensuse-arm

OBS-URL: https://build.opensuse.org/request/show/87732
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=25
---
 icu.changes  | 13 +++++++++++++
 icu.spec     |  8 +++++---
 pkgdata.diff | 22 ----------------------
 3 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 pkgdata.diff

diff --git a/icu.changes b/icu.changes
index 237f112..fed5b40 100644
--- a/icu.changes
+++ b/icu.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Oct 12 17:04:29 UTC 2011 - vuntz@opensuse.org
+
+- Drop pkgdata.diff: everything leads me to think this is not
+  needed anymore. Debian doesn't ship this patch with its 4.4
+  version of ICU. This patch was just a workaround in the first
+  place anyway.
+
+-------------------------------------------------------------------
+Tue Oct 11 22:26:44 CEST 2011 - dmueller@suse.de
+
+- Disable "make check" when run under qemu.
+
 -------------------------------------------------------------------
 Tue Aug  2 15:40:36 UTC 2011 - idonmez@novell.com
 
diff --git a/icu.spec b/icu.spec
index 85b8534..91c70fa 100644
--- a/icu.spec
+++ b/icu.spec
@@ -27,8 +27,6 @@ Group:          System/Libraries
 Source0:        icu4c-4_6_1-src.tar.bz2
 Source1:        icu4c-4_6_1-docs.tar.bz2
 Source3:        SuSEconfig.icu
-# PATCH-FIX-UPSTREAM pkgdata.diff -- http://bugs.icu-project.org/trac/ticket/6969#comment:19
-Patch0:         pkgdata.diff
 # PATCH-FIX-UPSTREAM icu44-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808
 Patch1:         icu44-rpmlint.diff
 # PATCH-FIX-OPENSUSE icu-remove-datetime.patch vuntz@novell.com -- Do not put date/time in icu-config (needed for build-compare)
@@ -127,7 +125,6 @@ the `libicu%{version}' package.
 
 %prep
 %setup -q -n icu -a1
-%patch0 -p0
 %patch1 -p1
 %patch99 -p1
 
@@ -166,7 +163,12 @@ rm %{buildroot}/%{_datadir}/icu/%{version}/install-sh
 
 %check
 cd source
+%if !0%{?qemu_user_space_build:1}
+# Checks disabled in qemu because of races happening when we emulate
+# multi-threaded programs, and some check tests atomic instructions in
+# multi-threaded icu invocations
 make check
+%endif
 
 %clean
 rm -rf %{buildroot}
diff --git a/pkgdata.diff b/pkgdata.diff
deleted file mode 100644
index edf1dcf..0000000
--- a/pkgdata.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- source/tools/pkgdata/pkgdata.cpp |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-Index: source/tools/pkgdata/pkgdata.cpp
-===================================================================
---- source/tools/pkgdata/pkgdata.cpp.orig
-+++ source/tools/pkgdata/pkgdata.cpp
-@@ -80,6 +80,13 @@ U_CDECL_END
- #define USING_CYGWIN
- #endif
- 
-+// Temporary fix until http://bugs.icu-project.org/trac/ticket/6969 is
-+// resolved.
-+#ifdef CAN_WRITE_OBJ_CODE
-+# undef CAN_WRITE_OBJ_CODE
-+# define BUILD_DATA_WITHOUT_ASSEMBLY
-+#endif
-+
- /*
-  * When building the data library without assembly,
-  * some platforms use a single c code file for all of