MozillaFirefox/MozillaFirefox.spec
branchfirefox81
changeset 1144 8a43aff7e982
parent 1143 ff28137410eb
child 1145 fbfd8f7cbd53
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Sep 17 14:32:09 2020 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Sep 30 09:47:34 2020 +0200
@@ -25,9 +25,9 @@
 # orig_suffix b3
 # major 69
 # mainver %major.99
-%define major          80
-%define mainver        %major.0.1
-%define orig_version   80.0.1
+%define major          81
+%define mainver        %major.0
+%define orig_version   81.0
 %define orig_suffix    %{nil}
 %define update_channel release
 %define branding       1
@@ -96,8 +96,8 @@
 BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
-BuildRequires:  mozilla-nspr-devel >= 4.27
-BuildRequires:  mozilla-nss-devel >= 3.55
+BuildRequires:  mozilla-nspr-devel >= 4.28
+BuildRequires:  mozilla-nss-devel >= 3.56
 BuildRequires:  nasm >= 2.14
 BuildRequires:  nodejs10 >= 10.21.0
 BuildRequires:  python-devel
@@ -209,9 +209,8 @@
 Patch26:        mozilla-bmo1626236.patch
 Patch27:        mozilla-s390x-skia-gradient.patch
 Patch28:        mozilla-libavcodec58_91.patch
-Patch29:        mozilla-system-nspr.patch
-Patch30:        mozilla-silence-no-return-type.patch
-Patch31:        mozilla-bmo1661715.patch
+Patch29:        mozilla-silence-no-return-type.patch
+Patch30:        revert-795c8762b16b.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -355,8 +354,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
-%patch31 -p1
+%patch30 -p1 -R
 # Firefox
 %patch101 -p1
 %patch102 -p1