diff -r 8e9195853a32 -r 572ec48f3fe8 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Tue Nov 19 22:54:22 2019 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Mon Nov 25 08:26:42 2019 +0100 @@ -19,13 +19,12 @@ # changed with every update %define major 70 -%define mainver %major.0 -%define orig_version 70.0 -%define orig_suffix %{nil} +%define mainver %major.99 +%define orig_version 71.0 +%define orig_suffix b11 %define update_channel beta %define branding 1 %define devpkg 1 -%define releasedate 20191016161957 # always build with GCC as SUSE Security Team requires that %define clang_build 0 @@ -73,7 +72,7 @@ %else BuildRequires: gcc-c++ %endif -BuildRequires: cargo >= 1.36 +BuildRequires: cargo >= 1.37 BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: libidl-devel @@ -81,14 +80,14 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.22 -BuildRequires: mozilla-nss-devel >= 3.46.1 +BuildRequires: mozilla-nspr-devel >= 4.23 +BuildRequires: mozilla-nss-devel >= 3.47.1 BuildRequires: nasm >= 2.13 BuildRequires: nodejs8 >= 8.11 BuildRequires: python-devel BuildRequires: python2-xml BuildRequires: python3 >= 3.5 -BuildRequires: rust >= 1.36 +BuildRequires: rust >= 1.37 BuildRequires: rust-cbindgen >= 0.9.1 BuildRequires: startup-notification-devel BuildRequires: unzip @@ -145,7 +144,6 @@ Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in Source4: tar_stamps -Source5: source-stamp.txt Source7: l10n-%{orig_version}%{orig_suffix}.tar.xz Source8: firefox-mimeinfo.xml Source9: firefox.js @@ -153,7 +151,7 @@ Source11: firefox.1 Source12: mozilla-get-app-id Source13: spellcheck.js -Source14: https://github.com/openSUSE/firefox-scripts/raw/master/create-tar.sh +Source14: https://github.com/openSUSE/firefox-scripts/raw/04d38e104a6ecdea33442755282688e8090ffa66/create-tar.sh Source15: firefox-appdata.xml Source16: %{name}.changes # Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys @@ -167,25 +165,25 @@ Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch Patch3: mozilla-ntlm-full-path.patch -Patch4: mozilla-openaes-decl.patch -Patch5: mozilla-aarch64-startup-crash.patch -Patch6: mozilla-bmo1463035.patch -Patch7: mozilla-cubeb-noreturn.patch -Patch8: mozilla-fix-aarch64-libopus.patch -Patch9: mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch -Patch10: mozilla-s390-context.patch -Patch11: mozilla-s390-bigendian.patch -Patch12: mozilla-reduce-rust-debuginfo.patch -Patch13: mozilla-ppc-altivec_static_inline.patch -Patch14: mozilla-bmo1005535.patch -Patch15: mozilla-bmo1568145.patch -Patch16: mozilla-bmo1504834-part1.patch -Patch17: mozilla-bmo1504834-part2.patch -Patch18: mozilla-bmo1504834-part3.patch -Patch19: mozilla-bmo1511604.patch -Patch20: mozilla-bmo1554971.patch -Patch21: mozilla-bmo1512162.patch -Patch22: mozilla-fix-top-level-asm.patch +Patch4: mozilla-aarch64-startup-crash.patch +Patch5: mozilla-bmo1463035.patch +Patch6: mozilla-cubeb-noreturn.patch +Patch7: mozilla-fix-aarch64-libopus.patch +Patch8: mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch +Patch9: mozilla-s390-context.patch +Patch10: mozilla-s390-bigendian.patch +Patch11: mozilla-reduce-rust-debuginfo.patch +Patch12: mozilla-ppc-altivec_static_inline.patch +Patch13: mozilla-bmo1005535.patch +Patch14: mozilla-bmo1568145.patch +Patch15: mozilla-bmo1504834-part1.patch +Patch16: mozilla-bmo1504834-part2.patch +Patch17: mozilla-bmo1504834-part3.patch +Patch18: mozilla-bmo1554971.patch +Patch19: mozilla-bmo1512162.patch +Patch20: mozilla-fix-top-level-asm.patch +Patch21: mozilla-bmo1504834-part4.patch +Patch22: mozilla-bmo849632.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -306,10 +304,10 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%ifarch s390x ppc64 %patch10 -p1 -%ifarch s390x ppc64 +%endif %patch11 -p1 -%endif %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -339,15 +337,15 @@ echo fix kde helper version in the .spec file exit 1 fi -source %{SOURCE5} +source %{SOURCE4} %endif # only_print_mozconfig export CARGO_HOME=${RPM_BUILD_DIR}/%{srcname}-%{orig_version}/.cargo -export MOZ_SOURCE_CHANGESET=$REV -export SOURCE_REPO=$REPO -export source_repo=$REPO -export MOZ_SOURCE_REPO=$REPO -export MOZ_BUILD_DATE=%{releasedate} +export MOZ_SOURCE_CHANGESET=$RELEASE_TAG +export SOURCE_REPO=$RELEASE_REPO +export source_repo=$RELEASE_REPO +export MOZ_SOURCE_REPO=$RELEASE_REPO +export MOZ_BUILD_DATE=$RELEASE_TIMESTAMP export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 @@ -444,9 +442,6 @@ ac_add_options --with-arch=armv7-a %endif %endif -%ifarch aarch64 %arm s390x -ac_add_options --disable-webrtc -%endif # mitigation/workaround for bmo#1512162 %ifarch s390x ac_add_options --enable-optimize="-O1"