[sunbird/f14/master] - fix build on s390

[Dan Horák]

commit 7f85288321dd3141ba03474cfe49ac48ee932bad
Author: Dan Horák <dan at danny.cz>
Date:   Thu Sep 16 20:38:37 2010 +0200

    - fix build on s390

 mozilla-build-s390.patch |   11 +++++++++++
 sunbird.spec             |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-build-s390.patch b/mozilla-build-s390.patch
new file mode 100644
index 0000000..efdc54e
--- /dev/null
+++ b/mozilla-build-s390.patch
@@ -0,0 +1,11 @@
+diff -up mozilla/js/src/jstl.h.old mozilla/js/src/jstl.h
+--- mozilla/js/src/jstl.h.old	2010-03-10 10:01:51.000000000 +0100
++++ mozilla/js/src/jstl.h	2010-03-10 12:24:55.000000000 +0100
+@@ -195,7 +195,6 @@ class ReentrancyGuard
+ static JS_ALWAYS_INLINE size_t
+ RoundUpPow2(size_t x)
+ {
+-    typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _;
+     size_t log2 = JS_CEILING_LOG2W(x);
+     JS_ASSERT(log2 < tl::BitSize<size_t>::result);
+     size_t result = size_t(1) << log2;
diff --git a/sunbird.spec b/sunbird.spec
index 0722388..35b13de 100644
--- a/sunbird.spec
+++ b/sunbird.spec
@@ -18,7 +18,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.28.b2pre%{?dist}
+Release:        0.29.b2pre%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -43,6 +43,7 @@ Patch1:         xulrunner-1.9.2.1-build.patch
 Patch10:        sunbird-1.0-libical.patch
 Patch11:        sunbird-1.0-uilocale.patch
 Patch12:        mozilla-missing-cflags.patch
+Patch13:        mozilla-build-s390.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -100,6 +101,9 @@ calendaring tasks.
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
 %patch12 -p1 -b .mozcflags
+%ifarch s390
+%patch13 -p0 -b .s390
+%endif
 
 find . -name '*.cpp' -o -name '*.h' |xargs chmod -x
 
@@ -242,6 +246,9 @@ fi
 
 
 %changelog
+* Thu Sep 16 2010 Dan Horák <dan[at]danny.cz> - 1.0-0.29.b2pre
+- fix build on s390
+
 * Wed Sep  8 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.28.b2pre
 - Changed thunderbird-lightning install location to /usr/lib/mozilla/extensions/{355...
 - Rebuild against Thunderbird 3.1.3