From bd188e11ef5be3e9eeed1fa59afeece6dff9fdba Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 7 Feb 2020 15:04:38 +0100
Subject: [PATCH] Update mock-core-configs to 32.0-2

---
 .gitignore             |  1 +
 mock-core-configs.spec | 52 ++++++++++++++++++++++++++++++++++++++----
 sources                |  2 +-
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00d262a..bf91a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /mock-core-configs-31.5.tar.gz
 /mock-core-configs-31.6.tar.gz
 /mock-core-configs-31.7.tar.gz
+/mock-core-configs-32.0.tar.gz
diff --git a/mock-core-configs.spec b/mock-core-configs.spec
index a516738..ea0f8c6 100644
--- a/mock-core-configs.spec
+++ b/mock-core-configs.spec
@@ -2,8 +2,8 @@
 %global mockgid 135
 
 Name:       mock-core-configs
-Version:    31.7
-Release:    1%{?dist}
+Version:    32.0
+Release:    2%{?dist}
 Summary:    Mock core config files basic chroots
 
 License:    GPLv2+
@@ -17,7 +17,7 @@ Source:     https://github.com/rpm-software-management/mock/releases/download/%{
 BuildArch:  noarch
 
 # distribution-gpg-keys contains GPG keys used by mock configs
-Requires:   distribution-gpg-keys >= 1.29
+Requires:   distribution-gpg-keys >= 1.36
 
 Requires(post): coreutils
 %if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7
@@ -49,17 +49,33 @@ Config files which allow you to create chroots for:
 
 
 %build
-# nothing to do here
+cd etc/host-overrides
+HOST=none
+%if 0%{?fedora}
+HOST="fedora-%{fedora}"
+%endif
+%if 0%{?rhel}
+HOST="rhel-%{rhel}"
+%endif
+
+if [ -d "$HOST" ]; then
+  pushd "$HOST"
+  for i in *.cfg; do
+    cat "$i" >> "../../mock/$i"
+  done
+  popd
+fi
 
 
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
 
-mkdir -p %{buildroot}%{_sysconfdir}/mock/eol
+mkdir -p %{buildroot}%{_sysconfdir}/mock/eol/templates
 mkdir -p %{buildroot}%{_sysconfdir}/mock/templates
 cp -a etc/mock/*.cfg %{buildroot}%{_sysconfdir}/mock
 cp -a etc/mock/templates/*.tpl %{buildroot}%{_sysconfdir}/mock/templates
 cp -a etc/mock/eol/*cfg %{buildroot}%{_sysconfdir}/mock/eol
+cp -a etc/mock/eol/templates/*.tpl %{buildroot}%{_sysconfdir}/mock/eol/templates
 
 # generate files section with config - there is many of them
 echo "%defattr(0644, root, mock)" > %{name}.cfgs
@@ -127,6 +143,32 @@ fi
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
 
 %changelog
+* Fri Feb 07 2020 Pavel Raiskup <praiskup@redhat.com> 32.0-2
+- solve yum.conf vs. dnf.conf inconsistency in config and code
+
+* Thu Feb 06 2020 Pavel Raiskup <praiskup@redhat.com> 32.0-1
+- add F32 configs and move rawhide to F33
+- make compatibility changes with mock 2.0
+- allow host overrides (build-time for now)
+- use jinja for gpgkey= in rawhide template
+- add rhel-{7,8}-s390x configs
+- drop rhel-8-ppc64, it was never supported
+- fix rhel-7 configs
+- update epel-8 config template to include modular repos as well as missing
+  non-modular source repo (mmathesi@redhat.com)
+- drop for a long time useless epel-6-ppc64 config
+- use template for opensuse, openmandriva, mageia, epel, custom ...
+- fix epel-6.tpl config bug
+- set default podman image for centos-stream
+- remove aarch64 string from repo name in template [RHBZ#1780977]
+- EOL F29 configs
+- fix rhelepel configs
+- allow including configs and templates from relative path (frostyx@email.cz)
+- configs: drop cost=2000 from fedora-31+-i386
+- add missing metadata_expire=0 to epel configs
+- change default of 'package_manager' to 'dnf', and use 'dnf.conf'
+- remove rhelbeta-8-*
+
 * Fri Nov 01 2019 Miroslav Suchý <msuchy@redhat.com> 31.7-1
 - Add configs for epel8-playground (mmathesi@redhat.com)
 - add 3 base packages to epel-playground buildroot [RHBZ#1764445]
diff --git a/sources b/sources
index 4c53ae4..f707db8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mock-core-configs-31.7.tar.gz) = 96701a149fe2c1af9a9d235dd486c86ebe9298080cd67663ca8bda4cdc5415f70de18731e488f7792582635363f322871b55592abc11609dd4a00ea094dae82d
+SHA512 (mock-core-configs-32.0.tar.gz) = 11de262b8bc796d0f51c2807b10cf150a8a25c2197b71ed31ee330679dff377336f5e850ae9e5622836eb24e87c54c42445f51d6f018b5731efc945da97bf58e