[seamonkey/f19] build against current nspr

Dmitry Butskoy buc at fedoraproject.org
Thu Nov 28 17:11:33 UTC 2013


commit 7fca2e295bc5c984cbc8b6b4349213e721d580b8
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Nov 28 21:11:06 2013 +0400

    build against current nspr

 seamonkey-2.22.1-nspr_4_10_1.patch |   12 ++++++++++++
 seamonkey.spec                     |    4 +++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/seamonkey-2.22.1-nspr_4_10_1.patch b/seamonkey-2.22.1-nspr_4_10_1.patch
new file mode 100644
index 0000000..68ffd9f
--- /dev/null
+++ b/seamonkey-2.22.1-nspr_4_10_1.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.22.1/comm-release/mozilla/configure seamonkey-2.22.1-OK/comm-release/mozilla/configure
+--- seamonkey-2.22.1/comm-release/mozilla/configure	2013-11-14 09:45:14.000000000 +0400
++++ seamonkey-2.22.1-OK/comm-release/mozilla/configure	2013-11-28 20:17:03.586451236 +0400
+@@ -14880,7 +14880,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-	min_nspr_version=4.10.2
++	min_nspr_version=4.10.1
+ 	echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6
+ echo "configure:14886: checking for NSPR - version >= $min_nspr_version" >&5
+ 
diff --git a/seamonkey.spec b/seamonkey.spec
index b1b1ea8..7f22fec 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.10.2
+%global minimum_build_nspr_version 4.10.1
 %global minimum_build_nss_version 3.15.0
 %global minimum_build_vpx_version 1.0.0
 
@@ -56,6 +56,7 @@ Patch5:         seamonkey-8.0-enable-addons.patch
 Patch10:        seamonkey-idl-parser-cachepath.patch
 Patch22:        seamonkey-2.14-installdir.patch
 Patch23:        seamonkey-2.22-elfhack.patch
+Patch24:	seamonkey-2.22.1-nspr_4_10_1.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with system_nspr}
@@ -146,6 +147,7 @@ popd
 
 %patch22 -p2 -b .installdir
 %patch23 -p2 -b .elfhack
+%patch24 -p2 -b .nspr_4_10_1
 
 # fix obsoleted modifier in inspector
 sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn


More information about the scm-commits mailing list