diff options
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | PKGBUILD | 29 | ||||
-rw-r--r-- | archlinux-defaults.cfg | 11 | ||||
-rw-r--r-- | mock.tmpfiles | 4 |
4 files changed, 23 insertions, 42 deletions
@@ -1,18 +1,19 @@ pkgbase = mock pkgdesc = A simple chroot build environment manager for building RPMs - pkgver = 2.10 + pkgver = 5.5 pkgrel = 1.1 url = https://github.com/rpm-software-management/mock install = mock.install arch = any - license = GPL2 - depends = mock-core-configs>=32.4 + license = GPL-2.0-or-later + depends = mock-core-configs>=39 depends = python + depends = python-backoff depends = python-distro - depends = python-jinja depends = python-pyroute2 depends = python-requests depends = python-templated-dictionary + depends = rpm-tools optdepends = createrepo_c: for mockchain command optdepends = dnf-plugins-core: to create RPMs for Fedora >= 24 and for Mageia optdepends = lvm2: for lvm_root plugin @@ -20,18 +21,14 @@ pkgbase = mock optdepends = pigz: for parallel compression of chroot cache optdepends = podman: to use bootstrap images optdepends = procenv: for procenv plugin - optdepends = python-requests: for mockchain command optdepends = yum-utils: to create RPMs for Fedora <= 23 (including EL5, EL6 and EL7) backup = etc/mock/logging.ini backup = etc/mock/site-defaults.cfg - source = https://github.com/rpm-software-management/mock/archive/mock-2.10-1.tar.gz - source = archlinux-defaults.cfg + source = https://github.com/rpm-software-management/mock/archive/mock-5.5-1.tar.gz source = mock.sysusers source = mock.tmpfiles - md5sums = 4cfe1f4fe3e989ab474c4bb3b5310e07 - md5sums = f64f312dfdca58dc510504041dcc9675 - md5sums = d277502b9a95484594f86231d073dae0 - md5sums = 1052fa4db74b59b0c195f4756bd865e8 + sha256sums = c5ed11a0a9716a0801ffbf31e764cf6130f6865a13d65e4e74140108a5ef4469 + sha256sums = f6cba3f7e7f35c3d811f548af9ff2044764b6b65eb9bd74f035904c0c8463651 + sha256sums = a32ef4b3a19490280d3e8fcdebe9dd3348636a97e214850ce6cfc6bffa56a5d3 pkgname = mock - @@ -6,16 +6,17 @@ #_with_usermode=1 pkgname=mock -pkgver=2.10 +pkgver=5.5 _rpmrel=1 _pkgtag=$pkgname-$pkgver-$_rpmrel pkgrel=$_rpmrel.1 pkgdesc="A simple chroot build environment manager for building RPMs" url="https://github.com/rpm-software-management/$pkgname" arch=('any') -license=('GPL2') -depends=('mock-core-configs>=32.4' 'python' 'python-distro' 'python-jinja' - 'python-pyroute2' 'python-requests' 'python-templated-dictionary') +license=('GPL-2.0-or-later') +depends=('mock-core-configs>=39' 'python' 'python-backoff' 'python-distro' + 'python-pyroute2' 'python-requests' 'python-templated-dictionary' + 'rpm-tools') ((_with_usermode)) && depends+=('usermode') optdepends=('createrepo_c: for mockchain command' 'dnf-plugins-core: to create RPMs for Fedora >= 24 and for Mageia' @@ -24,19 +25,16 @@ optdepends=('createrepo_c: for mockchain command' 'pigz: for parallel compression of chroot cache' 'podman: to use bootstrap images' 'procenv: for procenv plugin' - 'python-requests: for mockchain command' 'yum-utils: to create RPMs for Fedora <= 23 (including EL5, EL6 and EL7)') install="$pkgname.install" backup=("etc/$pkgname/logging.ini" "etc/$pkgname/site-defaults.cfg") source=("$url/archive/$_pkgtag.tar.gz" - "archlinux-defaults.cfg" "$pkgname.sysusers" "$pkgname.tmpfiles") -md5sums=('4cfe1f4fe3e989ab474c4bb3b5310e07' - 'f64f312dfdca58dc510504041dcc9675' - 'd277502b9a95484594f86231d073dae0' - '1052fa4db74b59b0c195f4756bd865e8') +sha256sums=('c5ed11a0a9716a0801ffbf31e764cf6130f6865a13d65e4e74140108a5ef4469' + 'f6cba3f7e7f35c3d811f548af9ff2044764b6b65eb9bd74f035904c0c8463651' + 'a32ef4b3a19490280d3e8fcdebe9dd3348636a97e214850ce6cfc6bffa56a5d3') _prefix=/usr _bindir=$_prefix/bin @@ -51,9 +49,6 @@ prepare() { cd "$pkgname-$pkgver" sed -e "s|@MOCK_DOCS@|$_docdir|" -i "mock-core-configs/etc/$pkgname/site-defaults.cfg" - - # Apply configuration required for Arch Linux systems - cat "$srcdir/archlinux-defaults.cfg" >> "mock-core-configs/etc/$pkgname/site-defaults.cfg" } build() { @@ -61,9 +56,9 @@ build() { pushd "$pkgname" >/dev/null - python_sitelib=$(python -c 'from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())') - sed -r -i "py/$pkgname"{,-parse-buildlog}.py \ - -e 's|^__VERSION__\s*=.*|__VERSION__="'$pkgver'"|' \ + python_sitelib=$(python -c 'from sysconfig import get_path; import sys; sys.stdout.write(get_path(name="purelib"))') + sed -r -i py/mockbuild/constants.py py/mock-parse-buildlog.py \ + -e 's|^VERSION\s*=.*|VERSION="'$pkgver'"|' \ -e 's|^SYSCONFDIR\s*=.*|SYSCONFDIR="'$_sysconfdir'"|' \ -e 's|^PYTHONDIR\s*=.*|PYTHONDIR="'$python_sitelib'"|' \ -e 's|^PKGPYTHONDIR\s*=.*|PKGPYTHONDIR="'$python_sitelib'/mockbuild"|' @@ -105,7 +100,7 @@ package() { mkdir -p "$pkgdir/$_sysconfdir/"pki/mock cp -Rp etc/pki/* "$pkgdir/$_sysconfdir/"pki/mock/ - python_sitelib=$(python -c 'from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())') + python_sitelib=$(python -c 'from sysconfig import get_path; import sys; sys.stdout.write(get_path(name="purelib"))') mkdir -p "$pkgdir/$python_sitelib/" cp -Rp py/mockbuild "$pkgdir/$python_sitelib/" diff --git a/archlinux-defaults.cfg b/archlinux-defaults.cfg deleted file mode 100644 index 473111836106..000000000000 --- a/archlinux-defaults.cfg +++ /dev/null @@ -1,11 +0,0 @@ - -# mock configuration required for Arch Linux systems -# -------------------------------------------------- - -# Since Arch Linux does not provides gtar symlink in tar package, -# bsdtar must be used instead -config_opts['tar'] = "bsdtar" - -# decompress_program is needed for bsdtar -config_opts['plugin_conf']['root_cache_opts']['decompress_program'] = "gunzip" -# -------------------------------------------------- diff --git a/mock.tmpfiles b/mock.tmpfiles index 59d54bd43170..341003e7db10 100644 --- a/mock.tmpfiles +++ b/mock.tmpfiles @@ -1,2 +1,2 @@ -d /var/cache/mock 2755 root mock - - -d /var/lib/mock 2755 root mock - - +d /var/cache/mock 0775 root mock - - +d /var/lib/mock 0775 root mock - - |