From dc72805513199057e70697fe7c2fbd939527a9ac Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 4 Dec 2014 15:50:06 +0100 Subject: [PATCH] Removed nss patch for epel --- firefox-system-nss-3.16.2.patch | 12 ------------ thunderbird.spec | 6 ------ 2 files changed, 18 deletions(-) delete mode 100644 firefox-system-nss-3.16.2.patch diff --git a/firefox-system-nss-3.16.2.patch b/firefox-system-nss-3.16.2.patch deleted file mode 100644 index 59980ff..0000000 --- a/firefox-system-nss-3.16.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.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 ab1d60a..b243b93 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -89,9 +89,6 @@ Patch300: xulrunner-24.0-jemalloc-ppc.patch Patch400: rhbz-966424.patch Patch401: mozilla-858919.patch -# Epel patches: -Patch500: firefox-system-nss-3.16.2.patch - %if %{official_branding} # Required by Mozilla Corporation @@ -178,9 +175,6 @@ cd mozilla %patch400 -p1 -b .966424 %patch401 -p1 -b .858919 -%if 0%{?rhel} > 6 -%patch500 -p2 -b .nss-ver -%endif cd .. %patch200 -p1 -b .addons