From 66a95cbcbb98a8f5fe2969af188dd76564fae72d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 2 Feb 2022 14:23:30 +0100 Subject: [PATCH] Update mock-core-configs to 37-1 --- mock-core-configs.spec | 27 ++++++++++----------------- sources | 2 +- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/mock-core-configs.spec b/mock-core-configs.spec index 0c501f7..9e41b32 100644 --- a/mock-core-configs.spec +++ b/mock-core-configs.spec @@ -1,6 +1,6 @@ Name: mock-core-configs -Version: 36.4 -Release: 2%{?dist} +Version: 37 +Release: 1%{?dist} Summary: Mock core config files basic chroots License: GPLv2+ @@ -18,26 +18,18 @@ BuildArch: noarch Provides: mock-configs # distribution-gpg-keys contains GPG keys used by mock configs -Requires: distribution-gpg-keys >= 1.60 +Requires: distribution-gpg-keys >= 1.64 # specify minimal compatible version of mock Requires: mock >= 2.5 Requires: mock-filesystem Requires(post): coreutils -%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7 # to detect correct default.cfg Requires(post): python3-dnf Requires(post): python3-hawkey Requires(post): system-release Requires(post): python3 Requires(post): sed -%endif -%if 0%{?rhel} && 0%{?rhel} <= 7 -# to detect correct default.cfg -Requires(post): python -Requires(post): yum -Requires(post): /etc/os-release -%endif %description Config files which allow you to create chroots for: @@ -126,15 +118,11 @@ else # something obsure, use buildtime version ver=%{?rhel}%{?fedora}%{?mageia} fi -%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7 if [ -s /etc/mageia-release ]; then mock_arch=$(sed -n '/^$/!{$ s/.* \(\w*\)$/\1/p}' /etc/mageia-release) else mock_arch=$(python3 -c "import dnf.rpm; import hawkey; print(dnf.rpm.basearch(hawkey.detect_arch()))") fi -%else -mock_arch=$(python -c "import rpmUtils.arch; baseArch = rpmUtils.arch.getBaseArch(); print baseArch") -%endif cfg=%{?fedora:fedora}%{?rhel:epel}%{?mageia:mageia}-$ver-${mock_arch}.cfg if [ -e %{_sysconfdir}/mock/$cfg ]; then if [ "$(readlink %{_sysconfdir}/mock/default.cfg)" != "$cfg" ]; then @@ -152,8 +140,13 @@ fi %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 36.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Wed Feb 02 2022 Pavel Raiskup 37-1 +- move CentOS/EPEL 8 configs to eol/ +- Fedora 36 branching, Rawhide == Fedora 37 now +- depend on distribution-gpg-keys 1.64 +- drop failovermethod=priority from EL8 configs +- Add Extras repo for CentOS Stream 9 (ngompa13@gmail.com) +- remove el7 specific parts from the spec file (msuchy@redhat.com) * Thu Dec 16 2021 Pavel Raiskup 36.4-1 - add CentOS Stream 9 + EPEL Next 9 (ngompa13@gmail.com) diff --git a/sources b/sources index 16c809f..e02918c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-core-configs-36.4.tar.gz) = 32c60b81cfa2b9a17633d936bfb7aa86d82d99d1c69709cce1be437010a62567d402a71e6e36b5593d3741516f3ef4adfc10b26c53fa546fc9b50ec843712dd9 +SHA512 (mock-core-configs-37.tar.gz) = 137a3d8de7fab7c46556ebd0c4805d48218471ed12ad6fa9d0e2acf6dca89de4accfb74dbdadcd83c732e5ffa70d6d0df3db0f87683a8e4189f11a6248e60ac6