From 5b34748e72f294630648f92a58bff07f099db1b4 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 1 Apr 2020 18:32:40 +0200 Subject: [PATCH] Update mock-core-configs to 32.6-1 --- mock-core-configs.spec | 23 +++++++++++++++++++++-- sources | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/mock-core-configs.spec b/mock-core-configs.spec index 31c302a..7a45124 100644 --- a/mock-core-configs.spec +++ b/mock-core-configs.spec @@ -2,7 +2,7 @@ %global mockgid 135 Name: mock-core-configs -Version: 32.5 +Version: 32.6 Release: 1%{?dist} Summary: Mock core config files basic chroots @@ -11,13 +11,19 @@ URL: https://github.com/rpm-software-management/mock/ # Source is created by # git clone https://github.com/rpm-software-management/mock.git # cd mock/mock-core-configs -# git reset --hard %{name}-%{version} +# git reset --hard %%{name}-%%{version} # tito build --tgz Source: https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.gz BuildArch: noarch +# The mock.rpm requires this. Other packages may provide this if they tend to +# replace the mock-core-configs.rpm functionality. +Provides: mock-configs + # distribution-gpg-keys contains GPG keys used by mock configs Requires: distribution-gpg-keys >= 1.36 +# specify minimal compatible version of mock +Requires: mock >= 2.2 Requires(post): coreutils %if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7 @@ -91,6 +97,10 @@ elif [ -d %{buildroot}%{_sysconfdir}/bash_completion.d ]; then echo %{_sysconfdir}/bash_completion.d/mock >> %{name}.cfgs fi +# reference valid mock.rpm's docdir with example site-defaults.cfg +mock_docs=%{_pkgdocdir} +mock_docs=${mock_docs//mock-core-configs/mock} +sed -i "s~@MOCK_DOCS@~$mock_docs~" %{buildroot}%{_sysconfdir}/mock/site-defaults.cfg %pre # check for existence of mock group, create it if not found @@ -143,6 +153,15 @@ fi %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg %changelog +* Wed Apr 01 2020 Pavel Raiskup 32.6-1 +- the site-defaults.cfg file moved from mock to mock-core-configs +- new option config_opts['isolation'], obsoletes 'use_nspawn' +- declare minimal version of mock, and set this to v2.2 as we use the new + 'isolation' config option now, and we provide site-defaults.cfg file +- specify amazonlinux bootstrap image, to fix --use-bootstrap-image +- allow to replace mock-core-configs by packages that 'Provides: mock-configs' +- rpmlint: remove macro in comment + * Thu Mar 26 2020 Pavel Raiskup 32.5-1 - Add Devel repo to CentOS 8 and CentOS Stream (ngompa13@gmail.com) - Add PowerTools sources repo entry to CentOS 8 and CentOS Stream diff --git a/sources b/sources index dba552f..55dc853 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-core-configs-32.5.tar.gz) = 552390758e877d9e70604eb29b056f3136fe510d59cbb995bc2d005687f99b466d7e6c64c7137682177b5b33d8c35142f268b2b6ac1a4b60292ca2eaddf5950b +SHA512 (mock-core-configs-32.6.tar.gz) = 519c73e3f9d34d748a21cfba95324dfdc3ba920475bd0dc9e8dc3e02ed95b7ad8c9d804412a812349553add603f24cd845850679e753bf42a97bf861684c01a5