[seamonkey/f18] update to 2.22.1

[Dmitry Butskoy]

commit 53165eec100062c2c75129f550bac0be9ba33f36
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Nov 28 04:04:35 2013 +0400

    update to 2.22.1

 seamonkey-2.19-elfhack.patch   |   12 ------------
 seamonkey-2.22-elfhack.patch   |   12 ++++++++++++
 seamonkey.spec                 |   22 +++++++++++++++-------
 sources                        |    4 ++--
 xulrunner-24.0-build-arm.patch |   12 ------------
 xulrunner-25.0-build-arm.patch |   12 ++++++++++++
 6 files changed, 41 insertions(+), 33 deletions(-)
---
diff --git a/seamonkey-2.22-elfhack.patch b/seamonkey-2.22-elfhack.patch
new file mode 100644
index 0000000..ac22924
--- /dev/null
+++ b/seamonkey-2.22-elfhack.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.22/comm-release/mozilla/build/unix/elfhack/Makefile.in seamonkey-2.22-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in
+--- seamonkey-2.22/comm-release/mozilla/build/unix/elfhack/Makefile.in	2013-10-29 05:20:42.000000000 +0400
++++ seamonkey-2.22-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in	2013-11-01 18:54:56.575000337 +0400
+@@ -22,7 +22,7 @@
+   elfhack.cpp \
+   $(NULL)
+ 
+-OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
++HOST_CXXFLAGS := $(filter-out -fno-exceptions,$(HOST_CXXFLAGS)) -fexceptions
+ 
+ CSRCS := \
+   test-ctors.c \
diff --git a/seamonkey.spec b/seamonkey.spec
index b950455..023b251 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -6,7 +6,7 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
 
-%global minimum_build_nspr_version 4.9.6
+%global minimum_build_nspr_version 4.10.2
 %global minimum_build_nss_version 3.15.0
 %global minimum_build_vpx_version 1.0.0
 
@@ -22,7 +22,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.21
+Version:        2.22.1
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
@@ -36,7 +36,7 @@ Source0:        http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
 #
 #   Run script as  ./moz-grab-langpacks --app seamonkey %{version}
 #
-Source1:        seamonkey-langpacks-%{version}-20130918.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20131119.tar.xz
 
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -51,11 +51,11 @@ Source100:      find-external-requires
 
 Patch1:         xulrunner-24.0-gcc47.patch
 Patch2:         xulrunner-24.0-jemalloc-ppc.patch
-Patch3:         xulrunner-24.0-build-arm.patch
+Patch3:         xulrunner-25.0-build-arm.patch
 Patch5:         seamonkey-8.0-enable-addons.patch
 Patch10:        seamonkey-idl-parser-cachepath.patch
 Patch22:        seamonkey-2.14-installdir.patch
-Patch23:        seamonkey-2.19-elfhack.patch
+Patch23:        seamonkey-2.22-elfhack.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with system_nspr}
@@ -113,8 +113,9 @@ Obsoletes: seamonkey-dom-inspector
 Obsoletes: seamonkey-js-debugger
 Obsoletes: seamonkey-mail
 
-# see http://bugzilla.redhat.com/bugzilla/866589
-ExcludeArch: ppc64
+# ppc64:   http://bugzilla.redhat.com/bugzilla/866589
+# armv7hl: http://bugzilla.redhat.com/bugzilla/1035485
+ExcludeArch: ppc64, armv7hl
 
 
 AutoProv: 0
@@ -468,6 +469,13 @@ fi
 
 
 %changelog
+* Wed Nov 27 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.22.1-1
+- update to 2.22.1
+- don't build for armv7hl (seems not enough memory on the build system, #1035485)
+
+* Sat Nov  2 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.22-1
+- update to 2.22
+
 * Thu Sep 19 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.21-1
 - update to 2.21
 
diff --git a/sources b/sources
index 379dd89..85f21fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f2ddfea12f80aab48cc3cfca9f15f2a2  seamonkey-2.21.source.tar.bz2
-2add02f1213d2bfba25e8264aa74690f  seamonkey-langpacks-2.21-20130918.tar.xz
+3f848db22d23aed2cd03d37bdc5fb256  seamonkey-2.22.1.source.tar.bz2
+a607f071c4371a083bc8024f5740ac56  seamonkey-langpacks-2.22.1-20131119.tar.xz
diff --git a/xulrunner-25.0-build-arm.patch b/xulrunner-25.0-build-arm.patch
new file mode 100644
index 0000000..0fed214
--- /dev/null
+++ b/xulrunner-25.0-build-arm.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build
+--- xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build.arm	2013-10-23 15:52:17.056493264 +0200
++++ xulrunner-25.0/mozilla-release/gfx/ycbcr/moz.build	2013-10-23 16:03:04.496045050 +0200
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     ASFILES += [
+         'yuv_row_arm.s',
+     ]