From 8134219203986c37c81cd7d44f00bd7a33e5f3b5 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Wed, 30 Jul 2014 09:52:54 +0200
Subject: [PATCH] Fixed nss version again

---
 firefox-system-nss-3.15.3.patch | 24 ------------------------
 firefox-system-nss-3.16.2.patch | 12 ++++++++++++
 thunderbird.spec                |  2 +-
 3 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 firefox-system-nss-3.15.3.patch
 create mode 100644 firefox-system-nss-3.16.2.patch

diff --git a/firefox-system-nss-3.15.3.patch b/firefox-system-nss-3.15.3.patch
deleted file mode 100644
index 4811f28..0000000
--- a/firefox-system-nss-3.15.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up mozilla/configure.in.system_nss mozilla/configure.in
---- mozilla/configure.in.system_nss	2014-01-30 23:56:48.000000000 +0100
-+++ mozilla/configure.in	2014-01-31 08:56:18.228879795 +0100
-@@ -3944,7 +3944,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
-     _USE_SYSTEM_NSS=1 )
- 
- if test -n "$_USE_SYSTEM_NSS"; then
--    AM_PATH_NSS(3.16.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+    AM_PATH_NSS(3.16.1, [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
-diff -up mozilla/configure.system_nss mozilla/configure
---- mozilla/configure.system_nss	2014-01-31 08:56:18.000000000 +0100
-+++ mozilla/configure	2014-01-31 09:14:03.252049304 +0100
-@@ -15224,7 +15224,7 @@ else
-   echo "$ac_t""no" 1>&6
- fi
- 
--	min_nss_version=3.16.2
-+	min_nss_version=3.16.1
- 	echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6
- echo "configure:15230: checking for NSS - version >= $min_nss_version" >&5
- 
diff --git a/firefox-system-nss-3.16.2.patch b/firefox-system-nss-3.16.2.patch
new file mode 100644
index 0000000..80a5712
--- /dev/null
+++ b/firefox-system-nss-3.16.2.patch
@@ -0,0 +1,12 @@
+diff -up firefox-24.3.0/mozilla-esr24/configure.in.nss firefox-24.3.0/mozilla-esr24/configure.in
+--- firefox-24.3.0/mozilla-esr24/configure.in.nss	2014-01-30 15:46:38.000000000 +0100
++++ firefox-24.3.0/mozilla-esr24/configure.in	2014-01-30 17:01:30.614179142 +0100
+@@ -3944,7 +3944,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
+     _USE_SYSTEM_NSS=1 )
+ 
+ if test -n "$_USE_SYSTEM_NSS"; then
+-    AM_PATH_NSS(3.16.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
++    AM_PATH_NSS(3.15.4, [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
diff --git a/thunderbird.spec b/thunderbird.spec
index 5b6b921..95879c5 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -89,7 +89,7 @@ Patch400:       rhbz-966424.patch
 Patch401:       revert-removal-of-native-notifications.patch
 
 # Epel patches:
-Patch500:       firefox-system-nss-3.15.3.patch
+Patch500:       firefox-system-nss-3.16.2.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation