diff -r 77c890186192 -r 0e45f8ad501c MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Nov 11 10:08:36 2017 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Jan 10 22:27:13 2018 +0100 @@ -1,8 +1,8 @@ # # spec file for package MozillaFirefox # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. -# 2006-2017 Wolfgang Rosenauer +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# 2006-2018 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,11 +18,11 @@ # changed with every update -%define major 56 +%define major 57 %define mainver %major.99 %define update_channel beta %define branding 1 -%define releasedate 20171102181127 +%define releasedate 20180108140638 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -75,6 +75,7 @@ BuildRequires: mozilla-nspr-devel >= 4.17 BuildRequires: mozilla-nss-devel >= 3.33 BuildRequires: python-devel +BuildRequires: python2-xml BuildRequires: rust >= 1.19 BuildRequires: rust-std BuildRequires: startup-notification-devel @@ -153,6 +154,9 @@ Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bindgen-systemlibs.patch +Patch9: mozilla-bmo1360278.patch +Patch10: mozilla-bmo1399611-csd.patch +Patch11: mozilla-rust-1.23.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -164,8 +168,8 @@ %if %branding Requires: %{name}-branding > 44.0 %endif -Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) -Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) +Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) +Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) Recommends: libcanberra0 Recommends: libpulse0 # addon leads to startup crash (bnc#908892) @@ -264,6 +268,9 @@ %endif %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 # Firefox %patch101 -p1 %patch102 -p1