[seamonkey/el6] update to 2.17
Dmitry Butskoy
buc at fedoraproject.org
Wed Apr 3 15:31:54 UTC 2013
commit 753ba1f7efa6c63b9d546f8d0584368e539663c3
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Wed Apr 3 19:31:18 2013 +0400
update to 2.17
.gitignore | 2 +
seamonkey-2.15-libjpeg62.patch | 375 --------------------
..._4_9_2.patch => seamonkey-2.17-nspr_4_9_2.patch | 26 +-
...3_13_6.patch => seamonkey-2.17-nss_3_14_0.patch | 40 +--
seamonkey-2.17-nss_hasht_h.patch | 17 +
...04121.patch => seamonkey-2.17-rhbz_304121.patch | 12 +-
seamonkey.spec | 35 ++-
sources | 4 +-
8 files changed, 75 insertions(+), 436 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5ea5c9..ee4e50b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.16.1-20130312.tar.xz
/seamonkey-2.16.2.source.tar.bz2
/seamonkey-langpacks-2.16.2-20130315.tar.xz
+/seamonkey-2.17.source.tar.bz2
+/seamonkey-langpacks-2.17-20130403.tar.xz
diff --git a/seamonkey-2.16-nspr_4_9_2.patch b/seamonkey-2.17-nspr_4_9_2.patch
similarity index 66%
rename from seamonkey-2.16-nspr_4_9_2.patch
rename to seamonkey-2.17-nspr_4_9_2.patch
index 202bfd2..0703cdb 100644
--- a/seamonkey-2.16-nspr_4_9_2.patch
+++ b/seamonkey-2.17-nspr_4_9_2.patch
@@ -1,14 +1,14 @@
-diff -Nrbu seamonkey-2.16/comm-release/configure seamonkey-2.16-OK/comm-release/configure
---- seamonkey-2.16/comm-release/configure 2013-02-18 08:07:07.000000000 +0400
-+++ seamonkey-2.16-OK/comm-release/configure 2013-02-21 20:56:22.641707488 +0400
-@@ -12943,13 +12943,13 @@
+diff -Nrbu seamonkey-2.17/comm-release/configure seamonkey-2.17-OK/comm-release/configure
+--- seamonkey-2.17/comm-release/configure 2013-04-01 07:31:30.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/configure 2013-04-03 16:34:52.020965943 +0400
+@@ -12947,13 +12947,13 @@
echo "$ac_t""no" 1>&6
fi
- min_nspr_version=4.9.3
+ min_nspr_version=4.9.2
echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
- echo "configure:12949: checking for NSPR - version >= $min_nspr_version" >&5
+ echo "configure:12953: checking for NSPR - version >= $min_nspr_version" >&5
no_nspr=""
if test "$NSPR_CONFIG" != "no"; then
@@ -17,17 +17,17 @@ diff -Nrbu seamonkey-2.16/comm-release/configure seamonkey-2.16-OK/comm-release/
NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`
elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
-diff -Nrbu seamonkey-2.16/comm-release/mozilla/configure seamonkey-2.16-OK/comm-release/mozilla/configure
---- seamonkey-2.16/comm-release/mozilla/configure 2013-02-18 08:07:07.000000000 +0400
-+++ seamonkey-2.16-OK/comm-release/mozilla/configure 2013-02-21 20:57:22.636832064 +0400
-@@ -14810,13 +14810,13 @@
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/configure seamonkey-2.17-OK/comm-release/mozilla/configure
+--- seamonkey-2.17/comm-release/mozilla/configure 2013-04-01 07:31:30.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/configure 2013-04-03 16:35:17.841392637 +0400
+@@ -14864,13 +14864,13 @@
echo "$ac_t""no" 1>&6
fi
- min_nspr_version=4.9.4
+ min_nspr_version=4.9.2
echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
- echo "configure:14816: checking for NSPR - version >= $min_nspr_version" >&5
+ echo "configure:14870: checking for NSPR - version >= $min_nspr_version" >&5
no_nspr=""
if test "$NSPR_CONFIG" != "no"; then
@@ -36,9 +36,9 @@ diff -Nrbu seamonkey-2.16/comm-release/mozilla/configure seamonkey-2.16-OK/comm-
NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
NSPR_VERSION_STRING=`$NSPR_CONFIG $nspr_config_args --version`
elif test -n "${NO_NSPR_CONFIG_SYSTEM_VERSION}"; then
-diff -Nrbu seamonkey-2.16/comm-release/nspr492/prtime.h seamonkey-2.16-OK/comm-release/nspr492/prtime.h
---- seamonkey-2.16/comm-release/nspr492/prtime.h 1970-01-01 03:00:00.000000000 +0300
-+++ seamonkey-2.16-OK/comm-release/nspr492/prtime.h 2013-02-21 20:56:22.981456711 +0400
+diff -Nrbu seamonkey-2.17/comm-release/nspr492/prtime.h seamonkey-2.17-OK/comm-release/nspr492/prtime.h
+--- seamonkey-2.17/comm-release/nspr492/prtime.h 1970-01-01 03:00:00.000000000 +0300
++++ seamonkey-2.17-OK/comm-release/nspr492/prtime.h 2013-04-03 16:31:50.919029783 +0400
@@ -0,0 +1,23 @@
+#ifndef nspr492_prtime_h___
+#define nspr492_prtime_h___
diff --git a/seamonkey-2.16-nss_3_13_6.patch b/seamonkey-2.17-nss_3_14_0.patch
similarity index 50%
rename from seamonkey-2.16-nss_3_13_6.patch
rename to seamonkey-2.17-nss_3_14_0.patch
index cae559f..df69e5c 100644
--- a/seamonkey-2.16-nss_3_13_6.patch
+++ b/seamonkey-2.17-nss_3_14_0.patch
@@ -1,30 +1,18 @@
-diff -Nrbu seamonkey-2.16/comm-release/configure seamonkey-2.16-OK/comm-release/configure
---- seamonkey-2.16/comm-release/configure 2013-02-21 18:12:12.269584742 +0400
-+++ seamonkey-2.16-OK/comm-release/configure 2013-02-21 18:22:33.724582188 +0400
-@@ -13122,7 +13122,7 @@
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/configure seamonkey-2.17-OK/comm-release/mozilla/configure
+--- seamonkey-2.17/comm-release/mozilla/configure 2013-04-03 18:12:46.288444449 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/configure 2013-04-03 18:14:05.347919663 +0400
+@@ -15267,7 +15267,7 @@
echo "$ac_t""no" 1>&6
fi
-- min_nss_version=3.14
-+ min_nss_version=3.13.6
+- min_nss_version=3.14.3
++ min_nss_version=3.14.0
echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
- echo "configure:13128: checking for NSS - version >= $min_nss_version" >&5
+ echo "configure:15273: checking for NSS - version >= $min_nss_version" >&5
-diff -Nrbu seamonkey-2.16/comm-release/mozilla/configure seamonkey-2.16-OK/comm-release/mozilla/configure
---- seamonkey-2.16/comm-release/mozilla/configure 2013-02-21 18:12:12.272583981 +0400
-+++ seamonkey-2.16-OK/comm-release/mozilla/configure 2013-02-21 18:22:45.669894612 +0400
-@@ -15213,7 +15213,7 @@
- echo "$ac_t""no" 1>&6
- fi
-
-- min_nss_version=3.14.1
-+ min_nss_version=3.13.6
- echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
- echo "configure:15219: checking for NSS - version >= $min_nss_version" >&5
-
-diff -Nrbu seamonkey-2.16/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp seamonkey-2.16-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp
---- seamonkey-2.16/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-02-18 08:06:46.000000000 +0400
-+++ seamonkey-2.16-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-02-21 18:20:59.940707435 +0400
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp seamonkey-2.17-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp
+--- seamonkey-2.17/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-04-01 07:31:10.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/security/manager/ssl/src/JARSignatureVerification.cpp 2013-04-03 18:15:23.204394048 +0400
@@ -355,7 +355,7 @@
}
@@ -52,10 +40,10 @@ diff -Nrbu seamonkey-2.16/comm-release/mozilla/security/manager/ssl/src/JARSigna
false)) {
PRErrorCode error = PR_GetError();
const char * errorName = PR_ErrorToName(error);
-diff -Nrbu seamonkey-2.16/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h seamonkey-2.16-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h
---- seamonkey-2.16/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-02-18 08:06:46.000000000 +0400
-+++ seamonkey-2.16-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-02-21 18:20:59.976279715 +0400
-@@ -160,7 +160,7 @@
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h seamonkey-2.17-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h
+--- seamonkey-2.17/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-04-01 07:31:10.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/security/manager/ssl/src/ScopedNSSTypes.h 2013-04-03 18:15:23.271393590 +0400
+@@ -161,7 +161,7 @@
{
nsresult rv = SetLength(hashAlg);
NS_ENSURE_SUCCESS(rv, rv);
diff --git a/seamonkey-2.17-nss_hasht_h.patch b/seamonkey-2.17-nss_hasht_h.patch
new file mode 100644
index 0000000..e179730
--- /dev/null
+++ b/seamonkey-2.17-nss_hasht_h.patch
@@ -0,0 +1,17 @@
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/media/mtransport/dtlsidentity.cpp seamonkey-2.17-OK/comm-release/mozilla/media/mtransport/dtlsidentity.cpp
+--- seamonkey-2.17/comm-release/mozilla/media/mtransport/dtlsidentity.cpp 2013-04-01 07:31:06.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/media/mtransport/dtlsidentity.cpp 2013-04-03 18:18:43.903998479 +0400
+@@ -174,7 +174,12 @@
+ if (algorithm == "sha-1") {
+ ht = HASH_AlgSHA1;
+ } else if (algorithm == "sha-224") {
+- ht = HASH_AlgSHA224;
++ /* RHEL6 still uses hasht.h header from nss-softokn-devel < 3.14
++ (for FIPS etc.), but Seamonkey actually links against nss-util == 3.14,
++ which supports HASH_AlgSHA224 (with a value of 7) and has true hasht.h
++ header.
++ */
++ ht = /* HASH_AlgSHA224 */ (HASH_HashType) 7;
+ } else if (algorithm == "sha-256") {
+ ht = HASH_AlgSHA256;
+ } else if (algorithm == "sha-384") {
diff --git a/seamonkey-2.15-rhbz_304121.patch b/seamonkey-2.17-rhbz_304121.patch
similarity index 51%
rename from seamonkey-2.15-rhbz_304121.patch
rename to seamonkey-2.17-rhbz_304121.patch
index b5064d7..42bff63 100644
--- a/seamonkey-2.15-rhbz_304121.patch
+++ b/seamonkey-2.17-rhbz_304121.patch
@@ -1,12 +1,12 @@
-diff -Nrbu seamonkey-2.15/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py seamonkey-2.15-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
---- seamonkey-2.15/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-06 10:26:26.000000000 +0400
-+++ seamonkey-2.15-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-14 17:51:55.668267309 +0400
-@@ -376,7 +376,7 @@
+diff -Nrbu seamonkey-2.17/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py seamonkey-2.17-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- seamonkey-2.17/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-04-01 07:31:07.000000000 +0400
++++ seamonkey-2.17-OK/comm-release/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-04-03 16:23:51.027633271 +0400
+@@ -377,7 +377,7 @@
WriteMakefile(output_file, data, build_file, depth, top,
# we set srcdir up one directory, since the subdir
# doesn't actually exist in the source directory
- swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
+ swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
- self.relative_srcdir)
+ self.relative_srcdir,
+ self.common_mk_path)
return True
-
diff --git a/seamonkey.spec b/seamonkey.spec
index 6c83bf3..a672e25 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -5,7 +5,7 @@
%define cairo_version 0.5
%define minimum_build_nspr_version 4.9.2
-%define minimum_build_nss_version 3.13.3
+%define minimum_build_nss_version 3.14.0
%define minimum_build_vpx_version 1.0.0
%define build_langpacks 1
@@ -20,7 +20,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.16.2
+Version: 2.17
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
@@ -34,7 +34,7 @@ Source0: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
#
# Run script as ./moz-grab-langpacks --app seamonkey %{version}
#
-Source1: seamonkey-langpacks-%{version}-20130315.tar.xz
+Source1: seamonkey-langpacks-%{version}-20130403.tar.xz
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -51,12 +51,12 @@ Patch1: xulrunner-15.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
Patch10: seamonkey-idl-parser-cachepath.patch
Patch20: seamonkey-2.13-jemalloc.patch
-Patch21: seamonkey-2.15-rhbz_304121.patch
+Patch21: seamonkey-2.17-rhbz_304121.patch
Patch22: seamonkey-2.14-installdir.patch
Patch23: seamonkey-2.14-elfhack.patch
-Patch24: seamonkey-2.16-nspr_4_9_2.patch
-Patch26: seamonkey-2.16-nss_3_13_6.patch
-Patch27: seamonkey-2.15-libjpeg62.patch
+Patch24: seamonkey-2.17-nspr_4_9_2.patch
+Patch26: seamonkey-2.17-nss_3_14_0.patch
+Patch27: seamonkey-2.17-nss_hasht_h.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -64,7 +64,7 @@ BuildRequires: nss-devel >= %{minimum_build_nss_version}
BuildRequires: nss-static >= %{minimum_build_nss_version}
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libpng-devel
-BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: zlib-devel
BuildRequires: zip
BuildRequires: libIDL-devel
@@ -101,6 +101,7 @@ Requires: libvpx >= %{minimum_build_vpx_version}
%endif
Requires: nspr >= %{minimum_build_nspr_version}
Requires: nss >= %{minimum_build_nss_version}
+Requires: libjpeg-turbo
Obsoletes: seamonkey-chat
Obsoletes: seamonkey-devel
@@ -111,8 +112,6 @@ Obsoletes: seamonkey-mail
# see http://bugzilla.redhat.com/bugzilla/866589
ExcludeArch: ppc64
-
-
AutoProv: 0
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE100}
@@ -143,8 +142,8 @@ popd
%patch23 -p2 -b .elfhack
%patch24 -p2 -b .nspr492
-%patch26 -p2 -b .nss3136
-%patch27 -p2 -b .jpeg62
+%patch26 -p2 -b .nss3140
+%patch27 -p2 -b .hashth
# fix obsoleted modifier in inspector
@@ -161,8 +160,9 @@ echo "ac_add_options --disable-elf-hack" >> .mozconfig
sed -i -e '/with-system-libvpx/ d' .mozconfig
%endif
-# WebRTC support requires nss >= 3.14, which is not provided by RHEL6 for a while...
+%ifnarch %{ix86} x86_64
echo "ac_add_options --disable-webrtc" >> .mozconfig
+%endif
%build
@@ -476,6 +476,13 @@ fi
%changelog
+* Wed Apr 3 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.17-1
+- update to 2.17
+- enable WebRTC
+- explicitly require libjpeg-turbo (since old libjpeg
+ does not provide all the needed features), drop libjpeg62 patch
+- fix build with NSS's hasht.h header from the system nss-softokn-devel < 3.14
+
* Fri Mar 15 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.16.2-1
- update to 2.16.2
@@ -823,7 +830,7 @@ fi
* Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8
- Changed license to MPL
* Tue Mar 14 2006 Kai Engert <kengert at redhat.com> 1.0-7
-- updated %files section, removed %preun,
+- updated %%files section, removed %%preun,
- removed explicit nspr/nss requires
* Thu Mar 02 2006 Kai Engert <kengert at redhat.com> 1.0-6
- Use a single package for all included applications.
diff --git a/sources b/sources
index 01e5d28..187d2f4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e6c747c409b9e3a8e09af32492c1b42b seamonkey-2.16.2.source.tar.bz2
-063b25639bb39cab86ec9919e357a241 seamonkey-langpacks-2.16.2-20130315.tar.xz
+931f027dd6e2aac3e36e788f6d86979b seamonkey-2.17.source.tar.bz2
+f19fdef1fa4b639f8479e445a07a8b92 seamonkey-langpacks-2.17-20130403.tar.xz
More information about the scm-commits
mailing list