[seamonkey] update to 2.33

[Dmitry Butskoy]

commit 1c9ee744fdc64c3ef63eef4f4b9df6bc1f86b2cb
Author: buc <buc at grad.stu.neva.ru>
Date:   Mon Mar 16 23:28:04 2015 +0300

    update to 2.33

 .gitignore                                   |   2 +
 firefox-34-mozilla-858919.patch              | 365 ---------------------------
 firefox-36-dictfix.patch                     |  28 ++
 seamonkey.sh.in-2.32 => seamonkey.sh.in-2.33 |   2 +-
 seamonkey.spec                               |  20 +-
 sources                                      |   4 +-
 6 files changed, 45 insertions(+), 376 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8d0576..9f6ccd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,5 @@ seamonkey-2.0.6.source.tar.bz2
 /seamonkey-langpacks-2.32-20150120.tar.xz
 /seamonkey-2.32.1.source.tar.bz2
 /seamonkey-langpacks-2.32.1-20150208.tar.xz
+/seamonkey-2.33.source.tar.bz2
+/seamonkey-langpacks-2.33-20150316.tar.xz
diff --git a/firefox-36-dictfix.patch b/firefox-36-dictfix.patch
new file mode 100644
index 0000000..12f6760
--- /dev/null
+++ b/firefox-36-dictfix.patch
@@ -0,0 +1,28 @@
+# Upstream Bug 1129859 - Always use '-' as separator between lang-region in dictionary names,
+# fixes problems with system dictionaries which has '_' as separator
+# Upstream patch with stripped test stuff
+#
+
+diff --git a/extensions/spellcheck/hunspell/src/mozHunspell.cpp b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+--- a/extensions/spellcheck/hunspell/src/mozHunspell.cpp
++++ b/extensions/spellcheck/hunspell/src/mozHunspell.cpp
+@@ -485,16 +485,19 @@ mozHunspell::LoadDictionariesFromDir(nsI
+     rv = file->Exists(&check);
+     if (NS_FAILED(rv) || !check)
+       continue;
+ 
+ #ifdef DEBUG_bsmedberg
+     printf("Adding dictionary: %s\n", NS_ConvertUTF16toUTF8(dict).get());
+ #endif
+ 
++    // Replace '_' separator with '-'
++    dict.ReplaceChar("_", '-');
++
+     mDictionaries.Put(dict, file);
+   }
+ 
+   return NS_OK;
+ }
+ 
+ nsresult mozHunspell::ConvertCharset(const char16_t* aStr, char ** aDst)
+ {
diff --git a/seamonkey.sh.in-2.32 b/seamonkey.sh.in-2.33
similarity index 98%
rename from seamonkey.sh.in-2.32
rename to seamonkey.sh.in-2.33
index 02a88fd..247be54 100755
--- a/seamonkey.sh.in-2.32
+++ b/seamonkey.sh.in-2.33
@@ -41,7 +41,7 @@ ulimit -c 0
 ##
 MOZ_DIST_BIN="LIBDIR/seamonkey-MOZILLA_VERSION"
 MOZ_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/seamonkey"
-MOZ_CLIENT_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/mozilla-xremote-client -a seamonkey"
+MOZ_CLIENT_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/seamonkey -remote"
 MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
 
 ##
diff --git a/seamonkey.spec b/seamonkey.spec
index 437b7cd..dc3414c 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -9,7 +9,7 @@
 %define cairo_version 0.5
 
 %global minimum_build_nspr_version 4.10.3
-%global minimum_build_nss_version 3.17.2
+%global minimum_build_nss_version 3.17.4
 %global minimum_build_vpx_version 1.3.0
 
 %define build_langpacks 1
@@ -24,7 +24,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.32.1
+Version:        2.33
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
@@ -38,9 +38,9 @@ Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{versi
 #
 #   Run script as  ./moz-grab-langpacks --app seamonkey %{version}
 #
-Source1:        seamonkey-langpacks-%{version}-20150208.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20150316.tar.xz
 
-Source3:        seamonkey.sh.in-2.32
+Source3:        seamonkey.sh.in-2.33
 Source4:        seamonkey.desktop
 Source7:        seamonkey-make-package.pl
 Source10:       seamonkey-mozconfig
@@ -54,9 +54,9 @@ Source100:      seamonkey-find-requires.sh
 Patch2:         xulrunner-24.0-jemalloc-ppc.patch
 Patch3:         xulrunner-27.0-build-arm.patch
 Patch4:         firefox-33-rhbz-966424.patch
-Patch5:         firefox-34-mozilla-858919.patch
-Patch7:                firefox-35-rhbz-1173156.patch
-Patch8:                firefox-35-rhbz-1014858.patch
+Patch5:         firefox-36-dictfix.patch
+Patch7:         firefox-35-rhbz-1173156.patch
+Patch8:         firefox-35-rhbz-1014858.patch
 Patch10:        firefox-33-build-prbool.patch
 Patch15:        seamonkey-2.32-enable-addons.patch
 Patch22:        seamonkey-2.32-installdir.patch
@@ -149,7 +149,7 @@ pushd mozilla
 %patch2 -p2 -b .jemalloc-ppc
 %patch3 -p2 -b .build-arm
 %patch4 -p2 -b .966424
-%patch5 -p1 -b .858919
+%patch5 -p1 -b .dictfix
 %patch7 -p2 -b .1173156
 %patch8 -p1 -b .1014858
 %patch10 -p1 -b .prbool
@@ -499,6 +499,10 @@ fi
 
 
 %changelog
+* Mon Mar 16 2015 Dmitry Butskoy <Dmitry at Butskoy.name> 2.33-1
+- update to 2.33
+- apply some patches from firefox-36 package
+
 * Sun Feb  8 2015 Dmitry Butskoy <Dmitry at Butskoy.name> 2.32.1-1
 - update to 2.32.1
 
diff --git a/sources b/sources
index 49cdd4a..9e02704 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-88a90d29af5f05e12a9c91e4c4d57c6e  seamonkey-2.32.1.source.tar.bz2
-e49059c489cc23f657ff29741086e55e  seamonkey-langpacks-2.32.1-20150208.tar.xz
+94a2ff3ac33602218fea4dfb5ef4af16  seamonkey-2.33.source.tar.bz2
+3ff6f9c1677f3e2aafb7f24967e47301  seamonkey-langpacks-2.33-20150316.tar.xz