[seamonkey/el6] Now can build under RHEL6.5 against the system nss/nspr without any patches.

Dmitry Butskoy buc at fedoraproject.org
Fri Nov 29 20:31:22 UTC 2013


commit c2551d52c2c7f76586c455efa09392f45838f8b5
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Sat Nov 30 00:29:35 2013 +0400

    Now can build under RHEL6.5 against the system nss/nspr without any patches.

 seamonkey.spec |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/seamonkey.spec b/seamonkey.spec
index 4225896..207e9b0 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -8,8 +8,8 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
 
-%global minimum_build_nspr_version 4.9.5
-%global minimum_build_nss_version 3.14.3
+%global minimum_build_nspr_version 4.9.6
+%global minimum_build_nss_version 3.15.0
 %global minimum_build_vpx_version 1.0.0
 
 %define build_langpacks 1
@@ -60,8 +60,6 @@ Patch10:        seamonkey-idl-parser-cachepath.patch
 Patch20:	seamonkey-2.21-c++0x.patch
 Patch22:	seamonkey-2.14-installdir.patch
 Patch23:	seamonkey-2.19-elfhack.patch
-Patch24:	seamonkey-2.21-nspr_4_9_5.patch
-Patch26:	seamonkey-2.21-nss_3_14_3.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with system_nspr}
@@ -156,13 +154,6 @@ popd
 %patch22 -p2 -b .installdir
 %patch23 -p2 -b .elfhack
 
-%if %{with system_nspr}
-%patch24 -p2 -b .nspr495
-%endif
-%if %{with system_nss}
-%patch26 -p2 -b .nss3143
-%endif
-
 
 # fix obsoleted modifier in inspector
 sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn


More information about the scm-commits mailing list