From 07092d9324299022d570ca549f4c6d10f42cfc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 8 Aug 2019 14:08:14 +0200
Subject: [PATCH] Update mock-core-configs to 30.5-1

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

diff --git a/.gitignore b/.gitignore
index 9b1a304..397e16a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /mock-core-configs-30.2.tar.gz
 /mock-core-configs-30.3.tar.gz
 /mock-core-configs-30.4.tar.gz
+/mock-core-configs-30.5.tar.gz
diff --git a/mock-core-configs.spec b/mock-core-configs.spec
index 4ca6310..4783005 100644
--- a/mock-core-configs.spec
+++ b/mock-core-configs.spec
@@ -2,8 +2,8 @@
 %global mockgid 135
 
 Name:		mock-core-configs
-Version:	30.4
-Release:	2%{?dist}
+Version:	30.5
+Release:	1%{?dist}
 Summary:	Mock core config files basic chroots
 
 License:	GPLv2+
@@ -19,8 +19,10 @@ BuildArch:	noarch
 # distribution-gpg-keys contains GPG keys used by mock configs
 Requires:	distribution-gpg-keys >= 1.29
 
-Requires(pre):	shadow-utils
 Requires(post): coreutils
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+BuildRequires: systemd-rpm-macros
+%endif
 %if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7
 # to detect correct default.cfg
 Requires(post):	python3-dnf
@@ -30,6 +32,7 @@ Requires(post):	python3
 Requires(post):	sed
 %endif
 %if 0%{?rhel} && 0%{?rhel} <= 7
+Requires(pre): shadow-utils
 # to detect correct default.cfg
 Requires(post):	python
 Requires(post):	yum
@@ -53,6 +56,11 @@ Config files which allow you to create chroots for:
 
 
 %install
+mkdir -p %{buildroot}%{_sysusersdir}
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+cp -a mock.conf %{buildroot}%{_sysusersdir}
+%endif
+
 mkdir -p %{buildroot}%{_sysconfdir}/mock/eol
 cp -a etc/mock/*.cfg %{buildroot}%{_sysconfdir}/mock
 cp -a etc/mock/eol/*cfg %{buildroot}%{_sysconfdir}/mock/eol
@@ -71,10 +79,15 @@ elif [ -d %{buildroot}%{_sysconfdir}/bash_completion.d ]; then
     echo %{_sysconfdir}/bash_completion.d/mock >> %{name}.cfgs
 fi
 
+
 %pre
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+%sysusers_create_package mock mock.conf
+%else
 # check for existence of mock group, create it if not found
 getent group mock > /dev/null || groupadd -f -g %mockgid -r mock
 exit 0
+%endif
 
 %post
 if [ -s /etc/os-release ]; then
@@ -116,13 +129,25 @@ fi
 
 %files -f %{name}.cfgs
 %license COPYING
+%if 0%{?fedora} > 29 || 0%{?rhel} > 8
+%{_sysusersdir}/mock.conf
+%endif
 %dir  %{_sysconfdir}/mock
 %dir  %{_sysconfdir}/mock/eol
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
 
 %changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 30.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Thu Aug 08 2019 Miroslav Suchý <msuchy@redhat.com> 30.5-1
+- disable updates-modulare repos for now
+- buildrequire systemd-srpm-macros to get _sysusersdir
+- removed info about metadata expire (khoidinhtrinh@gmail.com)
+- added updates-modular to 29 and 30 (khoidinhtrinh@gmail.com)
+- replace groupadd using sysusers.d
+- core-configs: epel-7 profiles to use mirrorlists (praiskup@redhat.com)
+- EOL Fedora 28
+- do not protect packages in chroot [GH#286]
+- Fix value for dist for OpenMandriva 4.0 configs (ngompa13@gmail.com)
+- Add initial OpenMandriva distribution targets (ngompa13@gmail.com)
 
 * Thu Jun 06 2019 Miroslav Suchý <msuchy@redhat.com> 30.4-1
 - Add 'fastestmirror=1' to Mageia mock configs (ngompa13@gmail.com)
diff --git a/sources b/sources
index 2482a5b..6a6974a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mock-core-configs-30.4.tar.gz) = 4db1fd1b89a4f811afa1336dabc0e22fc4f8daa739e98a85d3b7e40eb051fe4d9b8b506643fd5f16ff9e91972d6b6e32cbbe48792dc02974f60b67b53f5ce3aa
+SHA512 (mock-core-configs-30.5.tar.gz) = 218440fb9b8b9ea1b7c9a4c61deb3d6f9bec9ff01d6b87fadb1c54c9f9a1ef71b0169e997ae59064e1c5967bd4af52e6331c227e752dbbb5b0ba778bc8ab509f