Fixed nss version for epel

This commit is contained in:
Jan Horak 2014-07-30 09:23:38 +02:00
parent 11f4f2930d
commit d99ecfb088
2 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,24 @@
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

View File

@ -88,6 +88,9 @@ Patch304: mozilla-973977.patch
Patch400: rhbz-966424.patch
Patch401: revert-removal-of-native-notifications.patch
# Epel patches:
Patch500: firefox-system-nss-3.15.3.patch
%if %{official_branding}
# Required by Mozilla Corporation
@ -174,6 +177,10 @@ cd mozilla
%ifarch ppc64
%patch304 -p1 -b .973977
%endif
%if %{?epel}
%patch500 -p1 -b .nss-ver
%endif
cd ..
%patch200 -p1 -b .addons