MozillaFirefox/MozillaFirefox.spec
branchfirefox81
changeset 1145 fbfd8f7cbd53
parent 1144 8a43aff7e982
child 1147 e81381ea5f3d
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Sep 30 09:47:34 2020 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Sep 30 09:49:14 2020 +0200
@@ -17,6 +17,10 @@
 #
 
 
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150100
+#!BuildIgnore: post-build-checks
+%endif
+
 # changed with every update
 # orig_version vs. mainver: To have beta-builds
 # FF70beta3 would be released as FF69.99
@@ -100,13 +104,13 @@
 BuildRequires:  mozilla-nss-devel >= 3.56
 BuildRequires:  nasm >= 2.14
 BuildRequires:  nodejs10 >= 10.21.0
-BuildRequires:  python-devel
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
 BuildRequires:  python-libxml2
 BuildRequires:  python36
 %else
-BuildRequires:  python2-xml
+BuildRequires:  python3-devel
 BuildRequires:  python3 >= 3.5
+BuildRequires:  python3-curses
 %endif
 BuildRequires:  rust >= 1.43
 BuildRequires:  rust-cbindgen >= 0.14.3
@@ -209,8 +213,7 @@
 Patch26:        mozilla-bmo1626236.patch
 Patch27:        mozilla-s390x-skia-gradient.patch
 Patch28:        mozilla-libavcodec58_91.patch
-Patch29:        mozilla-silence-no-return-type.patch
-Patch30:        revert-795c8762b16b.patch
+Patch29:        revert-795c8762b16b.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -353,8 +356,7 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1
-%patch30 -p1 -R
+%patch29 -p1 -R
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -394,6 +396,7 @@
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
+export MACH_USE_SYSTEM_PYTHON=1
 %if 0%{?suse_version} <= 1320
 export CC=gcc-9
 %else