- bump nss requirement to workaround broken configure

diff --git a/bump-nss-req.patch b/bump-nss-req.patch
new file mode 100644 (file)
index 0000000..92c2b78
--- /dev/null
+++ b/bump-nss-req.patch
@@ -0,0 +1,22 @@
+--- icedove-31.3.0/mozilla/mozilla/configure.in~       2014-11-27 23:16:21.000000000 +0100
++++ icedove-31.3.0/mozilla/mozilla/configure.in        2014-12-03 22:29:51.134278969 +0100
+@@ -3655,7 +3655,7 @@
+     _USE_SYSTEM_NSS=1 )
+ 
+ if test -n "$_USE_SYSTEM_NSS"; then
+-    AM_PATH_NSS(3.16.2.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
++    AM_PATH_NSS(3.17.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+ 
+ if test -n "$MOZ_NATIVE_NSS"; then
+--- icedove-31.3.0/mozilla/mozilla/configure~  2014-11-27 23:18:38.000000000 +0100
++++ icedove-31.3.0/mozilla/mozilla/configure   2014-12-03 22:29:29.704278073 +0100
+@@ -15225,7 +15225,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-      min_nss_version=3.16.2.3
++      min_nss_version=3.17.0
+       echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
+ echo "configure:15231: checking for NSS - version >= $min_nss_version" >&5
+ 

diff --git a/icedove.spec b/icedove.spec
index 5558feb0cfb9fc4fb486ba98ce0a325ed8241f07..4051a094b4927a074d961914bc9bfc901a3c57f5 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -13,7 +13,7 @@
 %endif
 
 %define                nspr_ver        4.10.2
-%define                nss_ver         3.16.2
+%define                nss_ver         3.16.2.3
 
 %define                xulrunner_ver   2:24.0
 
@@ -46,6 +46,7 @@ Patch12:      no-subshell.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch13:       system-virtualenv.patch
 Patch15:       enable-addons.patch
+Patch16:       bump-nss-req.patch
 URL:           http://www.pld-linux.org/Packages/Icedove
 BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: alsa-lib-devel
@@ -157,6 +158,7 @@ cd mozilla
 %patch12 -p1
 %patch13 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 cd mozilla