summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlarchunix2020-05-23 13:27:34 +0200
committerlarchunix2020-05-23 13:27:34 +0200
commit76b6f995f17da1da6fb6fe3907c563d06934a7fd (patch)
treeb6da1fc83ef8348f45a3c9cda51ac1d115a63379
parenta9517228a3fee123b769fe55662addadcf4d2ab8 (diff)
downloadaur-76b6f995f17da1da6fb6fe3907c563d06934a7fd.tar.gz
Update to upstream release 2.2-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD21
-rw-r--r--archlinux-defaults.cfg11
3 files changed, 27 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f01cbd640f..7c1c1d68191 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mock
pkgdesc = A simple chroot build environment manager for building RPMs
- pkgver = 2.1
+ pkgver = 2.2
pkgrel = 1.1
url = https://github.com/rpm-software-management/mock
install = mock.install
@@ -22,10 +22,12 @@ pkgbase = mock
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.1-1.tar.gz
+ source = https://github.com/rpm-software-management/mock/archive/mock-2.2-1.tar.gz
+ source = archlinux-defaults.cfg
source = mock.sysusers
source = mock.tmpfiles
- md5sums = 57ae249a57b13f64fefd5e576df6e847
+ md5sums = c7c6eca7fe99eb28728a97f5be4d629f
+ md5sums = f64f312dfdca58dc510504041dcc9675
md5sums = d277502b9a95484594f86231d073dae0
md5sums = 1052fa4db74b59b0c195f4756bd865e8
diff --git a/PKGBUILD b/PKGBUILD
index d2ca9420779..bd5892d189e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
#_with_usermode=1
pkgname=mock
-pkgver=2.1
+pkgver=2.2
_rpmrel=1
_pkgtag=$pkgname-$pkgver-$_rpmrel
pkgrel=$_rpmrel.1
@@ -29,15 +29,18 @@ 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=('57ae249a57b13f64fefd5e576df6e847'
+md5sums=('c7c6eca7fe99eb28728a97f5be4d629f'
+ 'f64f312dfdca58dc510504041dcc9675'
'd277502b9a95484594f86231d073dae0'
'1052fa4db74b59b0c195f4756bd865e8')
_prefix=/usr
_bindir=$_prefix/bin
_datadir=$_prefix/share
+_docdir=$_datadir/doc/$pkgname
_mandir=$_datadir/man
_sysconfdir=/etc
@@ -46,14 +49,10 @@ prepare() {
cd "$pkgname-$pkgver"
- pushd "$pkgname" >/dev/null
-
- # ArchLinux does not provides gtar symlink
- sed -e "/config_opts\['tar'\]/ s|.*|config_opts['tar'] = \"bsdtar\"|" \
- -e "/config_opts\['plugin_conf'\]\['root_cache_opts'\]\['decompress_program'\]/ s|.*|config_opts['plugin_conf']['root_cache_opts']['decompress_program'] = \"gunzip\"|" \
- -i "etc/$pkgname/site-defaults.cfg"
+ sed -e "s|@MOCK_DOCS@|$_docdir|" -i "mock-core-configs/etc/$pkgname/site-defaults.cfg"
- popd >/dev/null
+ # Apply configuration required for Arch Linux systems
+ cat "$srcdir/archlinux-defaults.cfg" >> "mock-core-configs/etc/$pkgname/site-defaults.cfg"
}
build() {
@@ -95,6 +94,7 @@ package() {
mkdir -p "$pkgdir/$_sysconfdir/"mock
cp -Rp etc/mock/* "$pkgdir/$_sysconfdir/"mock/
+ cp -p ../mock-core-configs/etc/mock/site-defaults.cfg "$pkgdir/$_sysconfdir/"mock/
mkdir -p "$pkgdir/$_datadir/"bash-completion/completions
cp -Rp etc/bash_completion.d/* "$pkgdir/$_datadir/"bash-completion/completions/
@@ -120,7 +120,8 @@ package() {
ln -s /usr/bin/consolehelper "$pkgdir/usr/bin/$pkgname"
fi
- install -Dp -m644 docs/mock.cheat "$pkgdir/usr/share/doc/$pkgname/cheat/$pkgname"
+ install -Dp -m644 docs/site-defaults.cfg "$pkgdir/$_docdir/site-defaults.cfg"
+ install -Dp -m644 docs/mock.cheat "$pkgdir/$_docdir/cheat/$pkgname"
popd >/dev/null
diff --git a/archlinux-defaults.cfg b/archlinux-defaults.cfg
new file mode 100644
index 00000000000..47311183610
--- /dev/null
+++ b/archlinux-defaults.cfg
@@ -0,0 +1,11 @@
+
+# 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"
+# --------------------------------------------------