[seamonkey] update to 2.26

Dmitry Butskoy buc at fedoraproject.org
Thu May 8 22:59:37 UTC 2014 

commit 1d58e4b02035b5c3d4bfce0cf064e8e323de29aa
Author: buc <buc at grad.stu.neva.ru>
Date:   Fri May 9 03:02:12 2014 +0400

    update to 2.26

 .gitignore                         |    2 +
 seamonkey-2.23-installdir.patch    |   41 ------------------------------------
 seamonkey-2.26-enable-addons.patch |   26 ++++++++++++++++++++++
 seamonkey-2.26-installdir.patch    |   33 +++++++++++++++++++++++++++++
 seamonkey-8.0-enable-addons.patch  |   26 ----------------------
 seamonkey.spec                     |   14 ++++++++---
 sources                            |    4 +-
 7 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45894d6..7aa836d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@ seamonkey-2.0.6.source.tar.bz2
 /seamonkey-langpacks-2.24-20140209.tar.xz
 /seamonkey-2.25.source.tar.bz2
 /seamonkey-langpacks-2.25-20140322.tar.xz
+/seamonkey-2.26.source.tar.bz2
+/seamonkey-langpacks-2.26-20140506.tar.xz
diff --git a/seamonkey-2.26-enable-addons.patch b/seamonkey-2.26-enable-addons.patch
new file mode 100644
index 0000000..6addf16
--- /dev/null
+++ b/seamonkey-2.26-enable-addons.patch
@@ -0,0 +1,26 @@
+diff -Nrbu seamonkey-2.26/comm-release/mail/app/profile/all-thunderbird.js seamonkey-2.26-OK/comm-release/mail/app/profile/all-thunderbird.js
+--- seamonkey-2.26/comm-release/mail/app/profile/all-thunderbird.js	2014-04-29 08:55:07.000000000 +0400
++++ seamonkey-2.26-OK/comm-release/mail/app/profile/all-thunderbird.js	2014-05-06 21:38:43.918496556 +0400
+@@ -174,7 +174,7 @@
+ // Disable add-ons installed into the shared user and shared system areas by
+ // default. This does not include the application directory. See the SCOPE
+ // constants in AddonManager.jsm for values to use here
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
+ 
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+diff -Nrbu seamonkey-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm seamonkey-2.26-OK/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm
+--- seamonkey-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm	2014-04-29 09:03:18.000000000 +0400
++++ seamonkey-2.26-OK/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm	2014-05-06 21:38:43.920496556 +0400
+@@ -2051,8 +2051,8 @@
+         this.showUpgradeUI();
+         flushCaches = true;
+       }
+-      else if (aAppChanged === undefined) {
+-        // For new profiles we will never need to show the add-on selection UI
++    else {
++      // For all profiles we will never need to show the add-on selection UI
+         Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
+       }
+ 
diff --git a/seamonkey-2.26-installdir.patch b/seamonkey-2.26-installdir.patch
new file mode 100644
index 0000000..2ce9e49
--- /dev/null
+++ b/seamonkey-2.26-installdir.patch
@@ -0,0 +1,33 @@
+diff -Nrbu seamonkey-2.26/comm-release/config/baseconfig.mk seamonkey-2.26-OK/comm-release/config/baseconfig.mk
+--- seamonkey-2.26/comm-release/config/baseconfig.mk	2014-04-29 08:55:06.000000000 +0400
++++ seamonkey-2.26-OK/comm-release/config/baseconfig.mk	2014-05-06 22:24:50.327493588 +0400
+@@ -1,7 +1,7 @@
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
+diff -Nrbu seamonkey-2.26/comm-release/mozilla/config/baseconfig.mk seamonkey-2.26-OK/comm-release/mozilla/config/baseconfig.mk
+--- seamonkey-2.26/comm-release/mozilla/config/baseconfig.mk	2014-04-29 09:02:42.000000000 +0400
++++ seamonkey-2.26-OK/comm-release/mozilla/config/baseconfig.mk	2014-05-06 22:26:01.343493513 +0400
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
diff --git a/seamonkey.spec b/seamonkey.spec
index 2deeff1..c5934b7 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -22,7 +22,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.25
+Version:        2.26
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
@@ -36,7 +36,7 @@ Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{versi
 #
 #   Run script as  ./moz-grab-langpacks --app seamonkey %{version}
 #
-Source1:        seamonkey-langpacks-%{version}-20140322.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20140506.tar.xz
 
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -52,8 +52,8 @@ Source100:      find-external-requires
 Patch1:         xulrunner-26.0-gcc47.patch
 Patch2:         xulrunner-24.0-jemalloc-ppc.patch
 Patch3:         xulrunner-27.0-build-arm.patch
-Patch5:         seamonkey-8.0-enable-addons.patch
-Patch22:        seamonkey-2.23-installdir.patch
+Patch5:         seamonkey-2.26-enable-addons.patch
+Patch22:        seamonkey-2.26-installdir.patch
 Patch23:        seamonkey-2.25-elfhack.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -192,6 +192,9 @@ MOZ_SMP_FLAGS=-j1
 MOZ_SMP_FLAGS=%{?_smp_mflags}
 %endif
 
+#  a kludge since 2.26 ...
+ln -s ../objdir mozilla/objdir
+
 make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 
 
@@ -471,6 +474,9 @@ fi
 
 
 %changelog
+* Fri May  9 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.26-1
+- update to 2.26
+
 * Mon Mar 24 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.25-1
 - update to 2.25
 
diff --git a/sources b/sources
index ab183ba..f0e1b06 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e9597622d2d843ed9095a9e1eeab01f1  seamonkey-2.25.source.tar.bz2
-c769399e80117252d5a0e529d257715c  seamonkey-langpacks-2.25-20140322.tar.xz
+1749f6350209e35e0bede3bf4e56c42c  seamonkey-2.26.source.tar.bz2
+a44347b79e938fc6a14e71ade244498e  seamonkey-langpacks-2.26-20140506.tar.xz

More information about the scm-commits mailing list