rpms
/
firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f22

This commit is contained in:
Martin Stransky 2015-05-05 12:21:18 +02:00
parent 214368e9a1 f60522c534
commit 5f3c74b65c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firefox-nss-3.18.0.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up mozilla-release/configure.in.old mozilla-release/configure.in
--- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200
+++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200
@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then
- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ AM_PATH_NSS(3.18.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
diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile

2
firefox.spec
View File

@ -143,6 +143,7 @@ Patch215: firefox-enable-addons.patch
Patch219: rhbz-1173156.patch
Patch220: rhbz-1014858.patch
Patch221: firefox-fedora-ua.patch
Patch222: firefox-nss-3.18.0.patch
# Upstream patches
@ -295,6 +296,7 @@ cd %{tarballdir}
%patch219 -p2 -b .rhbz-1173156
%patch220 -p1 -b .rhbz-1014858
%patch221 -p2 -b .fedora-ua
%patch222 -p1 -b .nss-3.18.0
# Upstream patches
%if %{toolkit_gtk3}