[icu/f15] Resolves: rhbz#733162 F-14 only arm workaround

[Caolan McNamara]

commit 7793d4c43bdf8bc6d7d4e03b967cf411092f427b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 25 09:53:39 2011 +0100

    Resolves: rhbz#733162 F-14 only arm workaround

 icu.7664.armasm.patch |   31 +++++++++++++++++++++++++++++++
 icu.spec              |    7 ++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/icu.7664.armasm.patch b/icu.7664.armasm.patch
new file mode 100644
index 0000000..8e03587
--- /dev/null
+++ b/icu.7664.armasm.patch
@@ -0,0 +1,31 @@
+Description: change gcc assembler syntax to use % not @; % works for both x86 and ARM
+Origin: upstream, http://www.icu-project.org/trac/changeset/28107
+Bug: http://bugs.icu-project.org/trac/ticket/7664
+Bug-Debian: http://bugs.debian.org/589076
+
+Index: icu-4.4.1/source/tools/toolutil/pkg_genc.c
+===================================================================
+diff -adNru icu-4.4.1.orig/source/tools/toolutil/pkg_genc.c icu-4.4.1/source/tools/toolutil/pkg_genc.c
+--- icu-4.4.1.orig/source/tools/toolutil/pkg_genc.c     2010-04-28 15:27:46.000000000 +0000
++++ icu-4.4.1/source/tools/toolutil/pkg_genc.c  2010-07-14 18:30:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ /******************************************************************************
+- *   Copyright (C) 2009, International Business Machines
++ *   Copyright (C) 2009-2010, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  *******************************************************************************
+  */
+@@ -118,10 +118,10 @@
+ } assemblyHeader[] = {
+     {"gcc",
+         ".globl %s\n"
+-        "\t.section .note.GNU-stack,\"\", at progbits\n"
++        "\t.section .note.GNU-stack,\"\",%%progbits\n"
+         "\t.section .rodata\n"
+         "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
+-        "\t.type %s, at object\n"
++        "\t.type %s,%%object\n"
+         "%s:\n\n",
+ 
+         ".long ","",HEX_0X
+
diff --git a/icu.spec b/icu.spec
index d757697..8592e5c 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.4.2
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
@@ -19,6 +19,7 @@ Patch5: icu.7932.doublecompare.patch
 Patch6: icu.8011.buildfix.patch
 Patch7: icu.8198.revert.icu5431.patch
 Patch8: icu.8320.freeserif.crash.patch
+Patch9: icu.7664.armasm.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -66,6 +67,7 @@ BuildArch: noarch
 %patch6 -p1 -b .icu8011.buildfix.patch
 %patch7 -p2 -R -b .icu8198.revert.icu5431.patch
 %patch8 -p1 -b .icu8320.freeserif.crash.patch
+%patch9 -p1 -b .icu7664.armasm.patch
 
 %build
 cd source
@@ -148,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Thu Aug 25 2011 Caolán McNamara <caolanm at redhat.com> - 4.4.2-8
+- Resolves: rhbz#733162 F-14 only arm workaround
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild