[seamonkey/el6] update to 2.15.2

Dmitry Butskoy buc at fedoraproject.org
Mon Feb 4 17:46:33 UTC 2013


commit a680834ac9a4aeabfdb8d6692beeb9e981202b80
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Mon Feb 4 21:45:58 2013 +0400

    update to 2.15.2

 .gitignore                      |    2 +
 seamonkey-2.15-nspr_4_9_1.patch |  352 ---------------------------------------
 seamonkey-2.15-nspr_4_9_2.patch |   12 ++
 seamonkey.spec                  |   14 +-
 sources                         |    4 +-
 5 files changed, 25 insertions(+), 359 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cee1e68..6d3d7af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ seamonkey-2.0.6.source.tar.bz2
 /seamonkey-langpacks-2.15-20130109.tar.xz
 /seamonkey-2.15.1.source.tar.bz2
 /seamonkey-langpacks-2.15.1-20130121.tar.xz
+/seamonkey-2.15.2.source.tar.bz2
+/seamonkey-langpacks-2.15.2-20130204.tar.xz
diff --git a/seamonkey-2.15-nspr_4_9_2.patch b/seamonkey-2.15-nspr_4_9_2.patch
new file mode 100644
index 0000000..8c7c44e
--- /dev/null
+++ b/seamonkey-2.15-nspr_4_9_2.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.15.2/comm-release/mozilla/configure seamonkey-2.15.2-OK/comm-release/mozilla/configure
+--- seamonkey-2.15.2/comm-release/mozilla/configure	2013-02-03 12:10:10.000000000 +0400
++++ seamonkey-2.15.2-OK/comm-release/mozilla/configure	2013-02-04 21:13:22.902507145 +0400
+@@ -14883,7 +14883,7 @@
+   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:14889: checking for NSPR - version >= $min_nspr_version" >&5
+ 
diff --git a/seamonkey.spec b/seamonkey.spec
index b466a00..fbb5055 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -4,7 +4,7 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
 
-%define minimum_build_nspr_version 4.9
+%define minimum_build_nspr_version 4.9.2
 %define minimum_build_nss_version 3.13.3
 %define minimum_build_vpx_version 1.0.0
 
@@ -20,7 +20,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.15.1
+Version:        2.15.2
 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}-20130121.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20130204.tar.xz
 
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -54,7 +54,7 @@ Patch20:	seamonkey-2.13-jemalloc.patch
 Patch21:	seamonkey-2.15-rhbz_304121.patch
 Patch22:	seamonkey-2.14-installdir.patch
 Patch23:	seamonkey-2.14-elfhack.patch
-Patch24:	seamonkey-2.15-nspr_4_9_1.patch
+Patch24:	seamonkey-2.15-nspr_4_9_2.patch
 Patch25:	seamonkey-2.13.2-sidebar.patch
 Patch26:	seamonkey-2.15-nss_3_13_5.patch
 Patch27:	seamonkey-2.15-libjpeg62.patch
@@ -143,7 +143,7 @@ popd
 %patch22 -p2 -b .installdir
 %patch23 -p2 -b .elfhack
 
-%patch24 -p2 -b .nspr491
+%patch24 -p2 -b .nspr492
 %patch25 -p1 -b .sidebar
 %patch26 -p2 -b .nss3135
 %patch27 -p2 -b .jpeg62
@@ -478,6 +478,10 @@ fi
 
 
 %changelog
+* Mon Feb  4 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.15.2-1
+- update to 2.15.2
+- fix build with new system nspr-4.9.2
+
 * Mon Jan 21 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.15.1-1
 - update to 2.15.1
 - add fix for #304121 (derived from Xulrunner)
diff --git a/sources b/sources
index d6a5349..ef508ea 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-883757087d041e0a991c1ed96d161fa1  seamonkey-2.15.1.source.tar.bz2
-e4cd0dc8f58dfb0dc8226ab448ff80cc  seamonkey-langpacks-2.15.1-20130121.tar.xz
+1938c5a9673e94e9f5c809f5dbfe8d29  seamonkey-2.15.2.source.tar.bz2
+15b7fcef18b66190f2cb335b510f0f36  seamonkey-langpacks-2.15.2-20130204.tar.xz


More information about the scm-commits mailing list