From e61423f806ce431fb389a199cced74886f30967e Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@anakreon.cz>
Date: Wed, 19 Mar 2014 12:08:51 +0100
Subject: [PATCH] Arm build fix

---
 firefox.spec            | 10 ++++++----
 mozilla-build-arm.patch | 20 ++++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index c7400dd..d31e76b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -86,14 +86,11 @@
 %global tarballdir  mozilla-release
 %endif
 
-%if %{disable_arm}
-ExcludeArch: %{arm}
-%endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        28.0
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -222,7 +219,9 @@ cd %{tarballdir}
 # ignored during this compare.
 %patch0 -p1
 
+%ifarch %{arm}
 %patch3  -p2 -b .arm
+%endif
 %patch14 -p2 -b .chromium-types
 %patch17 -p1 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
@@ -634,6 +633,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Mar 19 2014 Martin Stransky <stransky@redhat.com> - 28.0-3
+- Arm build fix
+
 * Wed Mar 19 2014 Martin Stransky <stransky@redhat.com> - 28.0-2
 - NSS version up, disable arm for now
 
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index d61884e..1628018 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,7 +1,7 @@
-diff -up firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-27.0/mozilla-release/gfx/ycbcr/moz.build
---- firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-01-28 05:03:42.000000000 +0100
-+++ firefox-27.0/mozilla-release/gfx/ycbcr/moz.build	2014-02-03 11:14:34.062219509 +0100
-@@ -61,7 +61,7 @@ else:
+diff -up firefox-28.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-28.0/mozilla-release/gfx/ycbcr/moz.build
+--- firefox-28.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-03-11 01:54:04.000000000 +0100
++++ firefox-28.0/mozilla-release/gfx/ycbcr/moz.build	2014-03-11 10:12:19.586220802 +0100
+@@ -59,7 +59,7 @@ else:
          'yuv_row_other.cpp',
      ]
  
@@ -10,3 +10,15 @@ diff -up firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-27.0/mozil
      SOURCES += [
          'yuv_row_arm.s',
      ]
+diff -up firefox-28.0/mozilla-release/media/libtheora/lib/moz.build.arm firefox-28.0/mozilla-release/media/libtheora/lib/moz.build
+--- firefox-28.0/mozilla-release/media/libtheora/lib/moz.build.arm	2014-03-11 01:54:13.000000000 +0100
++++ firefox-28.0/mozilla-release/media/libtheora/lib/moz.build	2014-03-19 12:00:57.491064764 +0100
+@@ -20,7 +20,7 @@ UNIFIED_SOURCES += [
+     'state.c',
+ ]
+ 
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
++if CONFIG['GNU_AS']:
+     GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
+         'armbits-gnu',
+         'armfrag-gnu',