From 2203a1ae94b073a3fdec44778b34ec04face65af Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 30 Jul 2021 11:28:36 +0200 Subject: [PATCH] Add script to process the official tarball to comply with PELC review Resolves: rhbz#1988270 --- .gitignore | 1 + firefox.spec | 13 +++++++++++-- process-official-tarball | 23 +++++++++++++++++++++++ sources | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100755 process-official-tarball diff --git a/.gitignore b/.gitignore index baf97b2..0ea2bfc 100644 --- a/.gitignore +++ b/.gitignore @@ -270,3 +270,4 @@ /firefox-langpacks-78.11.0esr-20210531.tar.xz /firefox-langpacks-78.12.0esr-20210707.tar.xz /firefox-78.12.0esr.source.tar.xz +/firefox-78.12.0esr.processed-source.tar.xz diff --git a/firefox.spec b/firefox.spec index 407f6c1..3e5640f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -198,18 +198,24 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 78.12.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 7 ExcludeArch: s390 ppc %endif -Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz +# We can't use the official tarball as it contains some test files that use +# licenses that are rejected by Red Hat Legal. +# The official tarball has to be always processed by the process-official-tarball +# script. +# Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz +Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} Source1: firefox-langpacks-%{version}%{?pre_version}-20210707.tar.xz %endif Source2: cbindgen-vendor-0.14.3.tar.xz +Source3: process-official-tarball Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop @@ -1645,6 +1651,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Jul 30 2021 Tomas Popela - 78.12.0-2 +- Add script to process the official tarball to comply with PELC review + * Wed Jul 07 2021 Eike Rathke - 78.12.0-1 - Update to 78.12.0 build1 diff --git a/process-official-tarball b/process-official-tarball new file mode 100755 index 0000000..f925a84 --- /dev/null +++ b/process-official-tarball @@ -0,0 +1,23 @@ +#!/bin/sh + +rm -rf ./process-tarball-dir +mkdir ./process-tarball-dir +tar -xJf $1 --directory process-tarball-dir + +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0030-isvalid.html +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0008-isvalid.html +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0030-isvalid.html +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly-64.svg +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly.svg +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0230-novalid.html +rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvalid.html +rm -vf ./process-tarball-dir/*/layout/inspector/tests/chrome/test_fontVariationsAPI.css + +processed_tarball=${1/source/processed-source} + +cd ./process-tarball-dir +tar -cf - ./* | xz -9 -T 0 -f > $processed_tarball +mv $processed_tarball .. +cd .. + +rm -rf ./process-tarball-dir diff --git a/sources b/sources index 73f60dc..0a5bf92 100644 --- a/sources +++ b/sources @@ -9,4 +9,4 @@ SHA512 (cbindgen-vendor-0.14.3.tar.xz) = 33c8d28547674121f690eea0d3ebac33926a39c SHA512 (nss-3.53.1-3.fc32.src.rpm) = 368849487aa8f9d602c9e5d9d7c88ebd03318aece12470283ff31744ef9eed27ef1e32031378a5a673bb06a9ebbcf5542afa13f3ad465409449c218922189acb SHA512 (nodejs-10.21.0-5.fc32.src.rpm) = 4d0c212a2609dc10e242a96f63baa8babb91e8aa6696f66f627c562c1ba30cb3632ed01991c98f48b5942fc7fd89ee34b350f41de901339b49a2c19e979593a7 SHA512 (firefox-langpacks-78.12.0esr-20210707.tar.xz) = 2c5a88cab108bba707fd10183b2853e20450c206180a8d12f6b6f850fd35913996fb866c8736279bc4c4fd639cdb0fe7f409784be900e61d226ac9e429ce69fc -SHA512 (firefox-78.12.0esr.source.tar.xz) = 646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a +SHA512 (firefox-78.12.0esr.processed-source.tar.xz) = d4dfab99b2a234354f4b079ff352778a45ee0e5990a1d92f02a5fa50597bcabe69283ef23b4e47efdcde614ff9a7f30e6a46b0e826a88382c25b48745066b98b