From fb48de5e2338111effdb562c11ce934cf5cde456 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Sat, 28 Nov 2020 07:13:13 +0100 Subject: [PATCH] Added mochitest test files --- .gitignore | 1 + firefox.spec | 11 ++++++++--- sources | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 059ce10..bcae452 100644 --- a/.gitignore +++ b/.gitignore @@ -434,3 +434,4 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-83.0-20201112.tar.xz /firefox-langpacks-83.0-20201116.tar.xz /firefox-testing.tar.gz +/site-packages.tar.gz diff --git a/firefox.spec b/firefox.spec index 70d030d..eda3603 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,9 +1,9 @@ # Set to true if it's going to be submitted as update. -%global release_build 1 +%global release_build 0 %global debug_build 0 %global build_with_clang 0 %global build_with_asan 0 -%global run_firefox_tests 0 +%global run_firefox_tests 1 %global create_debuginfo 1 %global system_nss 1 @@ -125,7 +125,7 @@ ExcludeArch: aarch64 Summary: Mozilla Firefox Web browser Name: firefox Version: 83.0 -Release: 8%{?pre_tag}%{?dist} +Release: 9%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -151,6 +151,7 @@ Source33: firefox.appdata.xml.in Source34: firefox-search-provider.ini Source35: google-loc-api-key Source36: firefox-testing.tar.gz +Source37: site-packages.tar.gz # Build patches Patch3: mozilla-build-arm.patch @@ -707,6 +708,7 @@ cat > objdir/_virtualenvs/init_py3/pip.conf << EOF [install] find-links=`pwd`/mochitest-python EOF +tar xf %{SOURCE37} -C "objdir/_virtualenvs/init_py3/lib64/python3.9" ./run-tests %endif #--------------------------------------------------------------------- @@ -994,6 +996,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Nov 25 2020 Martin Stransky - 83.0-9 +- Added mochitest test files + * Wed Nov 25 2020 Martin Stransky - 83.0-8 - Added fix for rhbz#1900542 diff --git a/sources b/sources index 2752fa7..9bc225b 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (cbindgen-vendor.tar.xz) = 3c925c5523246b7dfbcb4ce563483d5b45315a06dc90f2 SHA512 (firefox-83.0.source.tar.xz) = 4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6 SHA512 (firefox-langpacks-83.0-20201116.tar.xz) = 0d26660a7f09481e82d8d88ac43917001301d422a94dc48d3913dff92805f100221ca6db15fea05e895221efe5a9d74c07780a671aebc26a69d7a588e1cd423d SHA512 (firefox-testing.tar.gz) = 2adda701576ee10b76e623d31f8b73d8ca3008c62dfb5942f77b29f84397bb4ebe42075d9c332f0ae4a115c85933bfaa0b4da03aaa8624cfae561721e03ffaad +SHA512 (site-packages.tar.gz) = cdeeb986a0fae736b5e1d6effce1decbb1d5365ea370ca7d88ae379b9a6bd41190f183a6aa934ef287272106f4a323eb8ea75bf9aae6388b7908047875882b85