From 36b3076498994649b4a1e846fa13a6d6b76cdad6 Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Aug 08 2019 12:06:00 +0000 Subject: Update mock to 1.4.17-1 Resolves: # - r FOO will try to read first ~/.mock/FOO.cfg if exists --- diff --git a/.gitignore b/.gitignore index c190ac9..d60dcf0 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ mock-1.1.4.tar.gz /mock-1.4.14.tar.gz /mock-1.4.15.tar.gz /mock-1.4.16.tar.gz +/mock-1.4.17.tar.gz diff --git a/mock.spec b/mock.spec index c25653d..1634061 100644 --- a/mock.spec +++ b/mock.spec @@ -14,7 +14,7 @@ Summary: Builds packages inside chroots Name: mock -Version: 1.4.16 +Version: 1.4.17 Release: 1%{?dist} License: GPLv2+ # Source is created by @@ -129,18 +129,18 @@ of the buildroot. %prep %setup -q -for file in py/mock.py py/mockchain.py; do +for file in py/mock.py py/mockchain.py py/mock-parse-buildlog.py; do sed -i 1"s|#!/usr/bin/python3 |#!%{__python} |" $file done %build -for i in py/mock.py py/mockchain.py; do +for i in py/mock.py py/mockchain.py py/mock-parse-buildlog.py; do perl -p -i -e 's|^__VERSION__\s*=.*|__VERSION__="%{version}"|' $i perl -p -i -e 's|^SYSCONFDIR\s*=.*|SYSCONFDIR="%{_sysconfdir}"|' $i perl -p -i -e 's|^PYTHONDIR\s*=.*|PYTHONDIR="%{python_sitelib}"|' $i perl -p -i -e 's|^PKGPYTHONDIR\s*=.*|PKGPYTHONDIR="%{python_sitelib}/mockbuild"|' $i done -for i in docs/mockchain.1 docs/mock.1; do +for i in docs/mockchain.1 docs/mock.1 docs/mock-parse-buildlog.1; do perl -p -i -e 's|\@VERSION\@|%{version}"|' $i done @@ -148,6 +148,7 @@ done install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_libexecdir}/mock install py/mockchain.py %{buildroot}%{_bindir}/mockchain +install py/mock-parse-buildlog.py %{buildroot}%{_bindir}/mock-parse-buildlog install py/mock.py %{buildroot}%{_libexecdir}/mock/mock ln -s consolehelper %{buildroot}%{_bindir}/mock install create_default_route_in_container.sh %{buildroot}%{_libexecdir}/mock/ @@ -164,6 +165,7 @@ cp -a etc/consolehelper/mock %{buildroot}%{_sysconfdir}/security/console.apps/%{ install -d %{buildroot}%{_datadir}/bash-completion/completions/ cp -a etc/bash_completion.d/* %{buildroot}%{_datadir}/bash-completion/completions/ ln -s mock %{buildroot}%{_datadir}/bash-completion/completions/mockchain +ln -s mock %{buildroot}%{_datadir}/bash-completion/completions/mock-parse-buildlog install -d %{buildroot}%{_sysconfdir}/pki/mock cp -a etc/pki/* %{buildroot}%{_sysconfdir}/pki/mock/ @@ -172,7 +174,9 @@ install -d %{buildroot}%{python_sitelib}/ cp -a py/mockbuild %{buildroot}%{python_sitelib}/ install -d %{buildroot}%{_mandir}/man1 -cp -a docs/mockchain.1 docs/mock.1 %{buildroot}%{_mandir}/man1/ +cp -a docs/mockchain.1 docs/mock.1 docs/mock-parse-buildlog.1 %{buildroot}%{_mandir}/man1/ +install -d %{buildroot}%{_datadir}/cheat +cp -a docs/mock.cheat %{buildroot}%{_datadir}/cheat/mock install -d %{buildroot}/var/lib/mock install -d %{buildroot}/var/cache/mock @@ -188,12 +192,14 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : %config(noreplace) %{_sysconfdir}/mock/site-defaults.cfg %{_datadir}/bash-completion/completions/mock %{_datadir}/bash-completion/completions/mockchain +%{_datadir}/bash-completion/completions/mock-parse-buildlog %defattr(-, root, root) # executables %{_bindir}/mock %{_bindir}/mockchain +%{_bindir}/mock-parse-buildlog %{_libexecdir}/mock # python stuff @@ -213,6 +219,8 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : # docs %{_mandir}/man1/mock.1* %{_mandir}/man1/mockchain.1* +%{_mandir}/man1/mock-parse-buildlog.1* +%{_datadir}/cheat/mock # cache & build dirs %defattr(0775, root, mock, 02775) @@ -232,6 +240,40 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : %endif %changelog +* Thu Aug 08 2019 Miroslav Suchý 1.4.17-1 +- change of exit code during transition from mockchain to mock --chain +- support run in Fedora Toolbox (otaylor@fishsoup.net) +- add cheat sheet +- Adding tool for parsing build.log (sisi.chlupova@gmail.com) +- load secondary groups [RHBZ#1264005] +- pass --allowerasing by default to DNF [GH#251] +- make include() functional for --chain [GH#263] +- Removing buildstderr from log - configurable via + _mock_stderr_line_prefix (sisi.chlupova@gmail.com) +- Fixup: Use rpm -qa --root instead of running rpm -qa in chroot + (miro@hroncok.cz) +- DynamicBuildrequires: Detect when no new packages were installed + (miro@hroncok.cz) +- Allow more loop devices (sisi.chlupova@gmail.com) +- Fix binary locations in /bin for split-usr setups (bero@lindev.ch) +- describe behaviour of resultdir together with --chain [GH#267] +- repeat dynamic requires if needed [GH#276] +- Fix compatibility with pre-4.15 RPM versions with DynamicBuildRequires + (i.gnatenko.brain@gmail.com) +- Enable dynamic BuildRequires by default (i.gnatenko.brain@gmail.com) +- bootstrap: independent network configuration (praiskup@redhat.com) +- Update the man page about ~/.config/mock/FOO.cfg (miro@hroncok.cz) +- explicitely convert releasever to string [GH#270] +- grant anyone access to bind-mounted /etc/resolv.conf (praiskup@redhat.com) +- -r FOO will try to read first ~/.mock/FOO.cfg if exists +- enhance man page of mock about --chain +- bash completion for --chain +- respect use_host_resolv config even with use_nspawn (praiskup@redhat.com) +- Fix crash on non-ascii dnf log messages (bkorren@redhat.com) +- add deprecation warning to mockchain +- replace mockchain with `mock --chain` command (necas.marty@gmail.com) +- switch to python3 on el7 (msuchy@redhat.com) + * Wed May 22 2019 Miroslav Suchý 1.4.16-1 - switch to python3 on el7 - respect use_host_resolv config even with use_nspawn (praiskup@redhat.com) diff --git a/sources b/sources index f5cc02c..1f896ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-1.4.16.tar.gz) = 6b72839cf818a9123210af0e80e447b56912910c476438022874cbdb708e16261e7e740b555731b9af84aaaeed86cf20d88d2316a59ef7eba6b8e4af912e12c2 +SHA512 (mock-1.4.17.tar.gz) = bfe0cce41814fef33a247f7756fc7ad5b8749b404b5c14771ab7ce8b5f9c33181556e49fbf6960d84de76dab119e1ae76dc6031363c0b99ee0a1b453947cd9fe