Skip to content

Fix check tests for brotli, gzip and python-certifi #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anphel31 merged 3 commits into from
Oct 21, 2020
Merged

Fix check tests for brotli, gzip and python-certifi #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a50d5cf
fix check test for brotli, gzip, python-cerifi
anphel31 Oct 21, 2020
8d2db7a
update manifest release version for gzip
anphel31 Oct 21, 2020
6be95e3
skip check for vim
anphel31 Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion SPECS/brotli/brotli.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Name: brotli
Version: 1.0.7
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Lossless compression algorithm
Group: Applications/File

Expand All @@ -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
Expand Down Expand Up @@ -130,6 +133,9 @@ python3 setup.py test


%changelog
* Tue Oct 20 2020 Andrew Phelps <anphel@microsoft.com> 1.0.7-8
- Fix check test

* Mon Dec 9 2019 Emre Girgin <mrgirgin@microsoft.com> 1.0.7-7
- Initial CBL-Mariner import from Fedora 31 (license: MIT).

Expand Down
12 changes: 9 additions & 3 deletions SPECS/gzip/gzip.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -34,10 +38,12 @@ make %{?_smp_mflags} check
%license COPYING
%{_bindir}/*
%{_mandir}/*/*

%changelog
* Tue Oct 20 2020 Andrew Phelps <anphel@microsoft.com> 1.9-5
- Fix check test
* Sat May 09 00:21:13 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.9-4
- Added %%license line automatically

* Fri Mar 03 2020 Jon Slobodzian <joslobo@microsoft.com> 1.9-3
- Fixed reference URL. Verified license.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.9-2
Expand Down
5 changes: 4 additions & 1 deletion SPECS/python-certifi/python-certifi.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,6 +17,7 @@ BuildRequires: python2-devel
BuildRequires: python-setuptools
%if %{with_check}
BuildRequires: pytest
BuildRequires: python3-xml
%endif

BuildArch: noarch
Expand Down Expand Up @@ -64,6 +65,8 @@ python3 setup.py test
%{python3_sitelib}/*

%changelog
* Tue Oct 20 2020 Andrew Phelps <anphel@microsoft.com> 2018.10.15-5
- Fix check test
* Sat May 09 00:20:57 PST 2020 Nick Samson <nisamson@microsoft.com> 2018.10.15-4
- Added %%license line automatically
* Wed May 06 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 2018.10.15-3
Expand Down
1 change: 1 addition & 0 deletions toolkit/resources/manifests/package/macros.override
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down