diff -r 4fd43e0d4a8f -r a9aa543a508a MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Thu Jul 23 16:04:32 2020 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Aug 22 08:33:39 2020 +0200 @@ -82,13 +82,13 @@ BuildRequires: dbus-1-glib-devel BuildRequires: dejavu-fonts BuildRequires: fdupes -BuildRequires: memory-constraints %if 0%{?suse_version} <= 1320 BuildRequires: gcc9-c++ %else BuildRequires: gcc-c++ %endif BuildRequires: cargo >= 1.43 +BuildRequires: ccache BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: libidl-devel @@ -186,7 +186,6 @@ Patch2: mozilla-kde.patch Patch3: mozilla-ntlm-full-path.patch Patch4: mozilla-aarch64-startup-crash.patch -Patch5: mozilla-bmo1463035.patch Patch6: mozilla-sandbox-fips.patch Patch7: mozilla-fix-aarch64-libopus.patch Patch8: mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch @@ -217,8 +216,9 @@ Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils Requires: %{name}-branding >= 68 -Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) -Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) +%requires_ge mozilla-nspr +%requires_ge mozilla-nss +%requires_ge libfreetype6 Recommends: libcanberra0 Recommends: libpulse0 # addon leads to startup crash (bnc#908892) @@ -326,7 +326,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -430,11 +429,6 @@ echo "" cat << EOF %else -%ifarch ppc64 ppc64le -%limit_build -m 2500 -%else -%limit_build -m 2000 -%endif cat << EOF > $MOZCONFIG %endif mk_add_options MOZILLA_OFFICIAL=1 @@ -465,6 +459,7 @@ #%endif ac_add_options --with-system-nspr ac_add_options --with-system-nss +ac_add_options --with-ccache %if %{localize} ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n %endif @@ -533,7 +528,7 @@ mkdir -p %{buildroot}%{progdir}/browser/extensions truncate -s 0 %{_tmppath}/translations.{common,other} sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_version}/browser/locales/shipped-locales \ - | xargs -n 1 -I {} /bin/sh -c ' + | xargs -n 1 -P 0 -I {} /bin/sh -c ' locale=$1 ./mach build langpack-$locale cp -L ../obj/dist/linux-*/xpi/firefox-%{orig_version}.$locale.langpack.xpi \ @@ -614,9 +609,9 @@ mkdir -p %{buildroot}%{_datadir}/mime/packages cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata -mkdir -p %{buildroot}%{_datadir}/appdata +mkdir -p %{buildroot}%{_datadir}/metainfo sed "s:firefox.desktop:%{desktop_file_name}:g" \ - %{SOURCE15} > %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml + %{SOURCE15} > %{buildroot}%{_datadir}/metainfo/%{desktop_file_name}.appdata.xml # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 @@ -749,7 +744,7 @@ %{gnome_dir}/share/icons/hicolor/ %{_bindir}/%{progname} %doc %{_mandir}/man1/%{progname}.1.gz -%{_datadir}/appdata/ +%{_datadir}/metainfo/ %if 0%{?devpkg} %files devel