From a50d5cf233d37abc992c0650fef8c0759c7bcd87 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Wed, 21 Oct 2020 01:57:02 -0700 Subject: [PATCH 1/3] fix check test for brotli, gzip, python-cerifi --- SPECS/brotli/brotli.spec | 8 +++++++- SPECS/gzip/gzip.spec | 12 +++++++++--- SPECS/python-certifi/python-certifi.spec | 5 ++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/SPECS/brotli/brotli.spec b/SPECS/brotli/brotli.spec index 41ec29f4d99..c0bfc04209b 100644 --- a/SPECS/brotli/brotli.spec +++ b/SPECS/brotli/brotli.spec @@ -4,7 +4,7 @@ Name: brotli Version: 1.0.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lossless compression algorithm Group: Applications/File @@ -18,6 +18,9 @@ Distribution: Mariner BuildRequires: cmake BuildRequires: python3-devel BuildRequires: python3-setuptools +%if %{with_check} +BuildRequires: python3-xml +%endif %description Brotli is a generic-purpose lossless compression algorithm that compresses @@ -130,6 +133,9 @@ python3 setup.py test %changelog +* Tue Oct 20 2020 Andrew Phelps 1.0.7-8 +- Fix check test + * Mon Dec 9 2019 Emre Girgin 1.0.7-7 - Initial CBL-Mariner import from Fedora 31 (license: MIT). diff --git a/SPECS/gzip/gzip.spec b/SPECS/gzip/gzip.spec index c068e38222e..123ffd27c0d 100644 --- a/SPECS/gzip/gzip.spec +++ b/SPECS/gzip/gzip.spec @@ -1,14 +1,18 @@ Summary: Programs for compressing and decompressing files Name: gzip Version: 1.9 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/gzip Group: Applications/File Vendor: Microsoft Corporation Distribution: Mariner Source0: http://ftp.gnu.org/gnu/gzip/%{name}-%{version}.tar.xz -%define sha1 gzip=0249ad4c4ca1f144714e8e21b6d0db24651fc122 + +%if %{with_check} +BuildRequires: less +%endif + %description The Gzip package contains programs for compressing and decompressing files. @@ -34,10 +38,12 @@ make %{?_smp_mflags} check %license COPYING %{_bindir}/* %{_mandir}/*/* + %changelog +* Tue Oct 20 2020 Andrew Phelps 1.9-5 +- Fix check test * Sat May 09 00:21:13 PST 2020 Nick Samson - 1.9-4 - Added %%license line automatically - * Fri Mar 03 2020 Jon Slobodzian 1.9-3 - Fixed reference URL. Verified license. * Tue Sep 03 2019 Mateusz Malisz 1.9-2 diff --git a/SPECS/python-certifi/python-certifi.spec b/SPECS/python-certifi/python-certifi.spec index cefc4488c59..623957e12ad 100644 --- a/SPECS/python-certifi/python-certifi.spec +++ b/SPECS/python-certifi/python-certifi.spec @@ -4,7 +4,7 @@ Summary: Python package for providing Mozilla's CA Bundle Name: python-certifi Version: 2018.10.15 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://github.com/certifi License: MPL-2.0 Group: Development/Languages/Python @@ -17,6 +17,7 @@ BuildRequires: python2-devel BuildRequires: python-setuptools %if %{with_check} BuildRequires: pytest +BuildRequires: python3-xml %endif BuildArch: noarch @@ -64,6 +65,8 @@ python3 setup.py test %{python3_sitelib}/* %changelog +* Tue Oct 20 2020 Andrew Phelps 2018.10.15-5 +- Fix check test * Sat May 09 00:20:57 PST 2020 Nick Samson 2018.10.15-4 - Added %%license line automatically * Wed May 06 2020 Pawel Winogrodzki 2018.10.15-3 From 8d2db7abe3110389f0da36263de16c89f05e299a Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Wed, 21 Oct 2020 02:22:39 -0700 Subject: [PATCH 2/3] update manifest release version for gzip --- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 4 ++-- toolkit/resources/manifests/package/toolchain_x86_64.txt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 38f9f2f4ea2..78508a922a6 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -56,7 +56,7 @@ gawk-4.2.1-3.cm1.aarch64.rpm findutils-4.6.0-7.cm1.aarch64.rpm findutils-lang-4.6.0-7.cm1.aarch64.rpm gettext-0.19.8.1-3.cm1.aarch64.rpm -gzip-1.9-4.cm1.aarch64.rpm +gzip-1.9-5.cm1.aarch64.rpm make-4.2.1-5.cm1.aarch64.rpm mariner-release-1.0-9.cm1.noarch.rpm patch-2.7.6-7.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index aeb8418e6c4..408fc777d74 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -56,7 +56,7 @@ gawk-4.2.1-3.cm1.x86_64.rpm findutils-4.6.0-7.cm1.x86_64.rpm findutils-lang-4.6.0-7.cm1.x86_64.rpm gettext-0.19.8.1-3.cm1.x86_64.rpm -gzip-1.9-4.cm1.x86_64.rpm +gzip-1.9-5.cm1.x86_64.rpm make-4.2.1-5.cm1.x86_64.rpm mariner-release-1.0-9.cm1.noarch.rpm patch-2.7.6-7.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index d60e0f0b432..029e72709d4 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -135,8 +135,8 @@ gtest-debuginfo-1.8.1-5.cm1.aarch64.rpm gtest-devel-1.8.1-5.cm1.aarch64.rpm gtest-static-1.8.1-5.cm1.aarch64.rpm gtk-doc-1.29-6.cm1.noarch.rpm -gzip-1.9-4.cm1.aarch64.rpm -gzip-debuginfo-1.9-4.cm1.aarch64.rpm +gzip-1.9-5.cm1.aarch64.rpm +gzip-debuginfo-1.9-5.cm1.aarch64.rpm integritysetup-2.3.3-2.cm1.aarch64.rpm intltool-0.51.0-7.cm1.noarch.rpm itstool-2.0.6-3.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 49c6408460d..cea4f13240c 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -135,8 +135,8 @@ gtest-debuginfo-1.8.1-5.cm1.x86_64.rpm gtest-devel-1.8.1-5.cm1.x86_64.rpm gtest-static-1.8.1-5.cm1.x86_64.rpm gtk-doc-1.29-6.cm1.noarch.rpm -gzip-1.9-4.cm1.x86_64.rpm -gzip-debuginfo-1.9-4.cm1.x86_64.rpm +gzip-1.9-5.cm1.x86_64.rpm +gzip-debuginfo-1.9-5.cm1.x86_64.rpm integritysetup-2.3.3-2.cm1.x86_64.rpm intltool-0.51.0-7.cm1.noarch.rpm itstool-2.0.6-3.cm1.noarch.rpm From 6be95e34f0f89833fb74ec77e15c26faaf1ebf96 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Wed, 21 Oct 2020 10:48:16 -0700 Subject: [PATCH 3/3] skip check for vim --- toolkit/resources/manifests/package/macros.override | 1 + 1 file changed, 1 insertion(+) diff --git a/toolkit/resources/manifests/package/macros.override b/toolkit/resources/manifests/package/macros.override index 21284ab77e9..6edbf44e541 100644 --- a/toolkit/resources/manifests/package/macros.override +++ b/toolkit/resources/manifests/package/macros.override @@ -18,6 +18,7 @@ %skip_check_python2 1 %skip_check_bash 1 %skip_check_gtk_doc 1 +%skip_check_vim 1 # Chmods /dev/null to 600 breaking many non-root applications. %skip_check_zstd 1