diff --git a/mock.spec b/mock.spec index e84c8fc..73039ce 100644 --- a/mock.spec +++ b/mock.spec @@ -1,26 +1,17 @@ %bcond_with tests -%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} >= 7 -%global use_python3 1 -%global use_python2 0 %global __python %{__python3} %global python_sitelib %{python3_sitelib} -%else -%global use_python3 0 -%global use_python2 1 -%global __python %{__python2} -%global python_sitelib %{python2_sitelib} -%endif Summary: Builds packages inside chroots Name: mock -Version: 1.4.21 +Version: 2.0 Release: 2%{?dist} License: GPLv2+ # Source is created by # git clone https://github.com/rpm-software-management/mock.git # cd mock -# git reset --hard %{name}-%{version} +# git reset --hard %%{name}-%%{version} # tito build --tgz Source: %{name}-%{version}.tar.gz URL: https://github.com/rpm-software-management/mock/ @@ -34,9 +25,6 @@ Requires: usermode %endif Requires: createrepo_c Requires: mock-core-configs >= 27.4 -%if 0%{?use_python2} -Requires: pyliblzma -%endif Requires: systemd %if 0%{?fedora} || 0%{?rhel} >= 8 Requires: systemd-container @@ -49,10 +37,8 @@ Suggests: iproute Suggests: iproute2 %endif BuildRequires: bash-completion -%if %{use_python3} Requires: python%{python3_pkgversion}-distro Requires: python%{python3_pkgversion}-jinja2 -Requires: python%{python3_pkgversion}-six >= 1.4.0 Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-rpm Requires: python%{python3_pkgversion}-pyroute2 @@ -60,17 +46,6 @@ BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} BuildRequires: python%{python3_pkgversion}-pylint %endif -%else -Requires: python-ctypes -Requires: python2-distro -Requires: python-jinja2 -Requires: python-six >= 1.4.0 -Requires: python-requests -Requires: python2-pyroute2 -Requires: python >= 2.7 -Requires: rpm-python -BuildRequires: python2-devel -%endif %if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} >= 8 Requires: dnf Suggests: yum @@ -228,26 +203,64 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || : %files scm %{python_sitelib}/mockbuild/scm.py* -%if %{use_python3} %{python3_sitelib}/mockbuild/__pycache__/scm.*.py* -%endif %files lvm %{python_sitelib}/mockbuild/plugins/lvm_root.* -%if %{use_python3} %{python3_sitelib}/mockbuild/plugins/__pycache__/lvm_root.*.py* -%endif %changelog -* Wed Jan 29 2020 Fedora Release Engineering - 1.4.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 01 2019 Miroslav Suchý 1.4.21-1 -- copy distribution-gpg-keys if this is boostrap and we use container image -- move podman initialization to buildroot.py [GH#380] -- bootstrap: fix --install and --installdeps [RHBZ#1447627] -- mock: selinuxfs, one more fix for nspawn [RHBZ#1756972] -- mock: fix broken rpmbuildstate [GH#349] +* Fri Feb 07 2020 Pavel Raiskup 2.0-2 +- solve yum.conf vs. dnf.conf inconsistency in code and config +- fix mockchain with --bootstrap-chroot (issue/469) +- document 'mock --chain -c' in man page + +* Thu Feb 06 2020 Pavel Raiskup 2.0-1 +- log reasons why src.rpm can not be installed into chroot +- nspawn: non-interactive commands in chroot are executed with --pipe +- bind mount local repos to bootstrap chroot (dturecek@redhat.com) +- expand the generated config (includes) completely before passing it + to eval() (sergio@serjux.com) +- do not ignore cleanup_on_success when post_install is True + (logans@cottsay.net) +- fix fd resource-leak in 'mock --chain' (jcajka@redhat.com) +- the --debug-config option only shows the differences from the mock's default + configuration +- do not expand jinja for --debug-config +- don't use chroot.pkg_manager in podman case, we need to install from within + the container +- --use-bootstrap-image implies --bootstrap-chroot +- drop python2 support from spec file, and code too +- ammend man page and state that --dnf is the default now +- rename --{old,new}-chroot to --isolation +- turn ON the jinja rendering a bit earlier +- pre-populate loop devices in nspawn chroot as with --isolation=chroot +- deepcopy the plugin_conf options from chroot to bootstrap_chroot +- simplified implementation of include() config option, accept relative files + (jkadlcik@redhat.com, sergio@serjux.com) +- pass proxy environment to exec of Podman (RHBZ#1772598) +- lvm_root: fix volume removal in --scrub +- bootstrap: don't install shadow-utils, and distribution-gpg-keys +- make --sources optional for --buildsrpm mode (sisi.chlupova@gmail.com) +- bootstrap: bind-mount normal chroot into bootstrap chroot recursively +- add --scrub=bootstrap parameter (frostyx@email.cz) +- don't clean bootstrap with --clean +- do not call traceLog decorator when no tracing +- pre-create builddir before changing it's owner, and when we have proper + process privileges +- copy /etc/pki/ca-trust/extracted into chroot [GH#397] +- change default of 'package_manager' to 'dnf' +- always copy distribution-gpg-keys into chroot [GH#308] +- support DNF vars added [GH#346] +- use jinja macros instead of python variable expansion +- get the text representation of error code +- --scrub=all also does --scrub=bootstrap (jkadlcik@redhat.com) +- success/fail aren't created root-owned +- compress_logs: setup defaults to 'gzip' +- raise error for --localrepo without --chain +- detect that forcearch can not work, and raise obvious error +- drop unnecessary privilege escalations which only make unnecessary + root-owned files * Fri Oct 04 2019 Miroslav Suchý 1.4.20-1 - /bin/mockchain wrapper around 'mock --chain' (praiskup@redhat.com) diff --git a/sources b/sources index bfeeaac..b82511f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mock-1.4.21.tar.gz) = 36de80878c7ccd48299c1522adfaead384815757c84c7756bd65e6971c498a13d69ca63e7babcedcf43aaa93937a67f6109c530e60af32908b8b3eec16d2315b +SHA512 (mock-2.0.tar.gz) = 33087e13c8150ef7a3e4a8fe03359c55398445cf81648652f223c311d1505542c70f87b571952fbc43c3f3cd853805238077f41d8b432d5fc1f5addc9341ff7b