From d94eb2a860863cdb6f11047f39304b5446f370ac Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Aug 06 2017 23:31:52 +0000 Subject: Update mock to 1.4.3-1 --- diff --git a/.gitignore b/.gitignore index 1e14e31..b5b3057 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ mock-1.1.4.tar.gz /mock-1.3.4.tar.gz /mock-1.4.1.tar.gz /mock-1.4.2.tar.gz +/mock-1.4.3.tar.gz diff --git a/mock.spec b/mock.spec index af15b44..93aa428 100644 --- a/mock.spec +++ b/mock.spec @@ -19,8 +19,8 @@ Summary: Builds packages inside chroots Name: mock -Version: 1.4.2 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} License: GPLv2+ # Source is created by # git clone https://github.com/rpm-software-management/mock.git @@ -65,7 +65,7 @@ Requires: python-ctypes Requires: python2-distro Requires: python-six >= 1.4.0 Requires: python-requests -Requires: python +Requires: python >= 2.7 Requires: rpm-python %endif BuildRequires: python-devel @@ -74,13 +74,16 @@ Requires: dnf Suggests: yum Requires: dnf-plugins-core Recommends: btrfs-progs +# to detect correct default.cfg +Requires(post): python3-dnf +Requires(post): python3-hawkey %endif %if 0%{?rhel} == 7 Requires: btrfs-progs Requires: yum >= 2.4 Requires: yum-utils %endif -BuildRequires: perl-interpreter +BuildRequires: perl # hwinfo plugin Requires: util-linux @@ -197,7 +200,11 @@ else # something obsure, use buildtime version ver=%{?rhel}%{?fedora} fi +%if 0%{?fedora} +mock_arch=$(python3 -c "import dnf.rpm; import hawkey; print(dnf.rpm.basearch(hawkey.detect_arch()))") +%else mock_arch=$(python -c "import rpmUtils.arch; baseArch = rpmUtils.arch.getBaseArch(); print baseArch") +%endif cfg=%{?fedora:fedora}%{?rhel:epel}-$ver-${mock_arch}.cfg if [ -e %{_sysconfdir}/%{name}/$cfg ]; then if [ "$(readlink %{_sysconfdir}/%{name}/default.cfg)" != "$cfg" ]; then @@ -259,8 +266,22 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : %endif %changelog -* Wed Jul 26 2017 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Mon Aug 07 2017 Miroslav Suchý 1.4.3-1 +- selinux: do not try to import yum when PM is dnf [RHBZ#1474513] +- create /dev nodes even when using nspawn [RHBZ#1467299] +- scm: define _sourcedir to checkout directory + (ignatenkobrain@fedoraproject.org) +- mageia-cauldron: Change releasever to 7 (ngompa13@gmail.com) +- enhance detection of RHEL [RHBZ#1470189] +- Add detection of OL (Oracle Linux) distribution + (pixdrift@users.noreply.github.com) +- Make LVM sleep time configurable (mizdebsk@redhat.com) +- on fedoras use python3 to detect correct arch in %%post [RHBZ#1462310] +- backend.py: quote check_opt (jlebon@redhat.com) +- Grammar fixes (ville.skytta@iki.fi) +- Docstring spelling fix (ville.skytta@iki.fi) +- Document python >= 2.7 requirement (ville.skytta@iki.fi) +- Remove obsolete internal_setarch config option (ville.skytta@iki.fi) * Sat Jun 10 2017 Miroslav Suchý 1.4.2-1 - define PermissionError for python2 diff --git a/sources b/sources index ff6adfd..cd10091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-1.4.2.tar.gz) = 907fb4ee8c2b16ccf3768db919efafb502ec9e9caa92c1207bd17d362947d1931d7654e5e3cfd516994bac6ccc0cca722e4e1b66a77238931af44499dab31bbd +SHA512 (mock-1.4.3.tar.gz) = 97f6e43daa7f13cf0b700dc69ad3d09273221ca23b971b2697c5a2cd8abd5e38e3ce97326debefe989b28fdda5785beef86b898e338fdd6697cf652d4d9fb381