Merge branch 'epel8' into epel7

This commit is contained in:
Miroslav Suchý 2019-08-19 10:46:49 +02:00
commit 8756e9b493
3 changed files with 29 additions and 20 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/mock-core-configs-30.3.tar.gz /mock-core-configs-30.3.tar.gz
/mock-core-configs-30.4.tar.gz /mock-core-configs-30.4.tar.gz
/mock-core-configs-30.5.tar.gz /mock-core-configs-30.5.tar.gz
/mock-core-configs-31.1.tar.gz

View File

@ -1,42 +1,42 @@
# mock group id allocate for Fedora # mock group id allocate for Fedora
%global mockgid 135 %global mockgid 135
Name: mock-core-configs Name: mock-core-configs
Version: 30.5 Version: 31.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Mock core config files basic chroots Summary: Mock core config files basic chroots
License: GPLv2+ License: GPLv2+
URL: https://github.com/rpm-software-management/mock/ URL: https://github.com/rpm-software-management/mock/
# Source is created by # Source is created by
# git clone https://github.com/rpm-software-management/mock.git # git clone https://github.com/rpm-software-management/mock.git
# cd mock/mock-core-configs # cd mock/mock-core-configs
# git reset --hard %{name}-%{version} # git reset --hard %{name}-%{version}
# tito build --tgz # tito build --tgz
Source: https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.gz Source: https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
# distribution-gpg-keys contains GPG keys used by mock configs # distribution-gpg-keys contains GPG keys used by mock configs
Requires: distribution-gpg-keys >= 1.29 Requires: distribution-gpg-keys >= 1.29
Requires(post): coreutils Requires(post): coreutils
%if 0%{?fedora} > 29 || 0%{?rhel} > 8 %if 0%{?fedora} > 29 || 0%{?rhel} > 8
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%endif %endif
%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7
# to detect correct default.cfg # to detect correct default.cfg
Requires(post): python3-dnf Requires(post): python3-dnf
Requires(post): python3-hawkey Requires(post): python3-hawkey
Requires(post): system-release Requires(post): system-release
Requires(post): python3 Requires(post): python3
Requires(post): sed Requires(post): sed
%endif %endif
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
Requires(pre): shadow-utils Requires(pre): shadow-utils
# to detect correct default.cfg # to detect correct default.cfg
Requires(post): python Requires(post): python
Requires(post): yum Requires(post): yum
Requires(post): /etc/os-release Requires(post): /etc/os-release
%endif %endif
%description %description
@ -137,6 +137,14 @@ fi
%ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg %ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
%changelog %changelog
* Mon Aug 19 2019 Miroslav Suchý <msuchy@redhat.com> 31.1-1
- add fedora 31 configs and rawhide is now 32
- Add local-source repo definition to Fedora Rawhide (miro@hroncok.cz)
* Mon Aug 19 2019 Miroslav Suchý <msuchy@redhat.com>
- add fedora 31 configs and rawhide is now 32
- Add local-source repo definition to Fedora Rawhide (miro@hroncok.cz)
* Thu Aug 08 2019 Miroslav Suchý <msuchy@redhat.com> 30.5-1 * Thu Aug 08 2019 Miroslav Suchý <msuchy@redhat.com> 30.5-1
- disable updates-modulare repos for now - disable updates-modulare repos for now
- buildrequire systemd-srpm-macros to get _sysusersdir - buildrequire systemd-srpm-macros to get _sysusersdir

View File

@ -1 +1 @@
SHA512 (mock-core-configs-30.5.tar.gz) = 218440fb9b8b9ea1b7c9a4c61deb3d6f9bec9ff01d6b87fadb1c54c9f9a1ef71b0169e997ae59064e1c5967bd4af52e6331c227e752dbbb5b0ba778bc8ab509f SHA512 (mock-core-configs-31.1.tar.gz) = 5d1effa53b358627ebba179ad633f577a14e941e323e2eee455ef38c56fbef1f50be7ad3caa1193c925d4ec3971b128591755fad159da6c7bb6913d25eadb3a1