From 185b328f4fa4e3d8d7df408f06b9c37afdf5489d0fdb5aa488aadcffc5a552ac Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 13 Aug 2020 22:06:03 +0000 Subject: [PATCH] - use ccache for build - replace versioned RPM deps with requires_ge - parallelize locale build OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=851 --- MozillaFirefox.changes | 7 +++++++ MozillaFirefox.spec | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 9024c6b..33b2fc5 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 10 09:19:38 UTC 2020 - Wolfgang Rosenauer + +- use ccache for build +- replace versioned RPM deps with requires_ge +- parallelize locale build + ------------------------------------------------------------------- Thu Aug 6 14:37:16 UTC 2020 - Yunhe Guo diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 09d6ce4..4c54f75 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -89,6 +89,7 @@ BuildRequires: gcc9-c++ BuildRequires: gcc-c++ %endif BuildRequires: cargo >= 1.43 +BuildRequires: ccache BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: libidl-devel @@ -216,8 +217,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build 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) @@ -463,6 +465,7 @@ ac_add_options --disable-elf-hack #%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 @@ -531,7 +534,7 @@ xvfb-run --server-args="-screen 0 1920x1080x24" \ 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 \