summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD16
2 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9246c7bd5c2..56eb88a9d742 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mock
pkgdesc = A simple chroot build environment manager for building RPMs
- pkgver = 1.4.19
+ pkgver = 1.4.20
pkgrel = 1.1
url = https://github.com/rpm-software-management/mock
install = mock.install
@@ -16,15 +16,16 @@ pkgbase = mock
optdepends = lvm2: for lvm_root plugin
optdepends = nosync: to speed up yum/dnf database access
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-1.4.19-1.tar.gz
+ source = https://github.com/rpm-software-management/mock/archive/mock-1.4.20-1.tar.gz
source = mock.sysusers
source = mock.tmpfiles
- md5sums = cdf5f548b9f0bed44e40f621b491c9df
+ md5sums = 6e48bb30d21966a0a5590b2e635770f8
md5sums = d277502b9a95484594f86231d073dae0
md5sums = 1052fa4db74b59b0c195f4756bd865e8
diff --git a/PKGBUILD b/PKGBUILD
index 2ea74eaaf821..59d236c6bf87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
#_with_usermode=1
pkgname=mock
-pkgver=1.4.19
+pkgver=1.4.20
_rpmrel=1
_pkgtag=$pkgname-$pkgver-$_rpmrel
pkgrel=$_rpmrel.1
@@ -21,6 +21,7 @@ optdepends=('createrepo_c: for mockchain command'
'lvm2: for lvm_root plugin'
'nosync: to speed up yum/dnf database access'
'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)')
@@ -30,7 +31,7 @@ backup=("etc/$pkgname/logging.ini"
source=("$url/archive/$_pkgtag.tar.gz"
"$pkgname.sysusers"
"$pkgname.tmpfiles")
-md5sums=('cdf5f548b9f0bed44e40f621b491c9df'
+md5sums=('6e48bb30d21966a0a5590b2e635770f8'
'd277502b9a95484594f86231d073dae0'
'1052fa4db74b59b0c195f4756bd865e8')
@@ -61,7 +62,7 @@ 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"{,chain,-parse-buildlog}.py \
+ sed -r -i "py/$pkgname"{,-parse-buildlog}.py \
-e 's|^__VERSION__\s*=.*|__VERSION__="'$pkgver'"|' \
-e 's|^SYSCONFDIR\s*=.*|SYSCONFDIR="'$_sysconfdir'"|' \
-e 's|^PYTHONDIR\s*=.*|PYTHONDIR="'$python_sitelib'"|' \
@@ -71,7 +72,7 @@ build() {
sed -r -i "py/$pkgname.py" \
-e 's|/usr/libexec/mock/mock|/usr/bin/mock.py|'
- sed -e "s|@VERSION@|$pkgver|" -i "docs/$pkgname"{,chain,-parse-buildlog}.1
+ sed -e "s|@VERSION@|$pkgver|" -i "docs/$pkgname"{,-parse-buildlog}.1
python -m compileall py/ -q
python -O -m compileall py/ -q
@@ -85,8 +86,8 @@ package() {
pushd "$pkgname" >/dev/null
mkdir -p "$pkgdir/$_bindir/"
- install -Dp -m755 py/mock.py "$pkgdir/$_bindir/"mock
- install -Dp -m755 py/mockchain.py "$pkgdir/$_bindir/"mockchain
+ install -Dp -m755 py/mock.py "$pkgdir/$_bindir/"mock
+ install -Dp -m755 mockchain "$pkgdir/$_bindir/"mockchain
install -Dp -m755 py/mock-parse-buildlog.py "$pkgdir/$_bindir/"mock-parse-buildlog
mkdir -p "$pkgdir/$_sysconfdir/"pam.d
@@ -97,7 +98,6 @@ package() {
mkdir -p "$pkgdir/$_datadir/"bash-completion/completions
cp -Rp etc/bash_completion.d/* "$pkgdir/$_datadir/"bash-completion/completions/
- ln -s mock "$pkgdir/$_datadir/"bash-completion/completions/mockchain
ln -s mock "$pkgdir/$_datadir/"bash-completion/completions/mock-parse-buildlog
mkdir -p "$pkgdir/$_sysconfdir/"pki/mock
@@ -108,7 +108,7 @@ package() {
cp -Rp py/mockbuild "$pkgdir/$python_sitelib/"
mkdir -p "$pkgdir/$_mandir/"man1
- cp -Rp "docs/$pkgname"{,chain,-parse-buildlog}.1 "$pkgdir/$_mandir/"man1/
+ cp -Rp "docs/$pkgname"{,-parse-buildlog}.1 "$pkgdir/$_mandir/"man1/
if ((_with_usermode)); then
mkdir -p "$pkgdir/$_sysconfdir/"security/console.apps/