From c7044866ecb4f206c74dc866fc7065f20d659499 Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Dec 22 2017 12:38:10 +0000 Subject: Update mock to 1.4.8-1 --- diff --git a/.gitignore b/.gitignore index ab30de4..ae76594 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ mock-1.1.4.tar.gz /mock-1.4.5.tar.gz /mock-1.4.6.tar.gz /mock-1.4.7.tar.gz +/mock-1.4.8.tar.gz diff --git a/mock.spec b/mock.spec index 06d4f01..294b73d 100644 --- a/mock.spec +++ b/mock.spec @@ -16,8 +16,8 @@ Summary: Builds packages inside chroots Name: mock -Version: 1.4.7 -Release: 2%{?dist} +Version: 1.4.8 +Release: 1%{?dist} License: GPLv2+ # Source is created by # git clone https://github.com/rpm-software-management/mock.git @@ -36,7 +36,6 @@ Requires: usermode %endif Requires: createrepo_c Requires: mock-core-configs >= 27.4 -Requires(post): coreutils %if 0%{?use_python2} Requires: pyliblzma %endif @@ -102,10 +101,17 @@ Mock takes an SRPM and builds it in a chroot. %package scm Summary: Mock SCM integration module Requires: %{name} = %{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} < 8 Requires: cvs Requires: git Requires: subversion Requires: tar +%else +Recommends: cvs +Recommends: git +Recommends: subversion +Recommends: tar +%endif %description scm Mock SCM integration module. @@ -171,10 +177,6 @@ cp -a docs/mockchain.1 docs/mock.1 %{buildroot}%{_mandir}/man1/ install -d %{buildroot}/var/lib/mock install -d %{buildroot}/var/cache/mock -%post -# fix cache permissions from old installs -chmod 2775 %{_localstatedir}/cache/%{name} - %check # ignore the errors for now, just print them and hopefully somebody will fix it one day pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : @@ -182,12 +184,8 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : %files %defattr(0644, root, mock) %config(noreplace) %{_sysconfdir}/mock/site-defaults.cfg -%if 0%{?rhel} == 6 -%{_sysconfdir}/bash_completion.d/mock -%else %{_datadir}/bash-completion/completions/mock %{_datadir}/bash-completion/completions/mockchain -%endif %defattr(-, root, root) @@ -232,6 +230,22 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : %endif %changelog +* Fri Dec 22 2017 Miroslav Suchý 1.4.8-1 +- orphanskill: send SIGKILL when SIGTERM is not enough [RHBZ#1495214] +- pass --non-unique to usermod because of old targets +- remove _selinuxYumIsSetoptSupported() +- only use -R if first umount failed +- use recursive unmount for tmpfs +- do not cd to dir if nspawn is used [GH#108] +- add new option --config-opts [GH#138] +- add --enable-network to bash_completation +- Strip trailing / from mountpath in ismounted() +- new cli option --enable-network [RHBZ#1513953] +- when creating yum/dnf.conf copy timestamp from host [RHBZ#1293910] +- do not populate /etc/resolv.conf when networking is disabled [RHBZ#1514028] +- soften mock-scm dependencies [RHBZ#1515989] +- mount /proc and /sys before executing any PM command [RHBZ#1467299] + * Tue Oct 31 2017 Miroslav Suchý 1.4.7-1 - user and group is actually not used here since some logic moved to buildroot.py - add config_opts['chrootgroup'] to site-defaults.cfg diff --git a/sources b/sources index dc50249..73e0f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-1.4.7.tar.gz) = 58e88b521e64f2eea4ed9f7a186610730aeaeb5f2a4e16a4e6b1e4420b064f7940353c087fdc7680ce271299aeeebe81fab72df4aa720f6a2a1624ec8137b4bd +SHA512 (mock-1.4.8.tar.gz) = ae31c0b98cd671a759945787b660f04da4636040dbc68c89ee3b3174d6178e90e55c17b3e67213801ef6c683299b3f7f2e18c35b5d178e64a459ac8cc750f9c9