summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlarchunix2022-07-23 10:00:15 +0200
committerlarchunix2022-07-23 10:00:15 +0200
commit6098071aca31e9c11657e2a27923e472d8e426ed (patch)
treee9a9826d3a1584b03f81683e38e20eb1a60e56b5
parent793661a3864435f34f274663f19f704a51576636 (diff)
downloadaur-6098071aca31e9c11657e2a27923e472d8e426ed.tar.gz
Update to upstream release 3.1-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--archlinux-defaults.cfg11
3 files changed, 5 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb1480f9ce05..bf1ffe282898 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mock
pkgdesc = A simple chroot build environment manager for building RPMs
- pkgver = 3.0
+ pkgver = 3.1
pkgrel = 1.1
url = https://github.com/rpm-software-management/mock
install = mock.install
@@ -24,12 +24,10 @@ 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-3.0-1.tar.gz
- source = archlinux-defaults.cfg
+ source = https://github.com/rpm-software-management/mock/archive/mock-3.1-1.tar.gz
source = mock.sysusers
source = mock.tmpfiles
- sha256sums = 60fe689017925767e6c21b47d15aa638b7623895188855b60e771a3221b3da5a
- sha256sums = e32d7e96c6ea3c1fb06f20bca60d7e9bc92e70e0eab52e74b0070264c94cef9c
+ sha256sums = da4b0a0ba08dbdc1eae3ca05f3970e36f26e538146539049607ed5121b06068a
sha256sums = f6cba3f7e7f35c3d811f548af9ff2044764b6b65eb9bd74f035904c0c8463651
sha256sums = 7fd98f2d7700996041a835551a746cc8e6ab1048c7b297db9ac5c5534dd87d86
diff --git a/PKGBUILD b/PKGBUILD
index b6e5dd8b0453..d6973de55433 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
#_with_usermode=1
pkgname=mock
-pkgver=3.0
+pkgver=3.1
_rpmrel=1
_pkgtag=$pkgname-$pkgver-$_rpmrel
pkgrel=$_rpmrel.1
@@ -30,11 +30,9 @@ 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")
-sha256sums=('60fe689017925767e6c21b47d15aa638b7623895188855b60e771a3221b3da5a'
- 'e32d7e96c6ea3c1fb06f20bca60d7e9bc92e70e0eab52e74b0070264c94cef9c'
+sha256sums=('da4b0a0ba08dbdc1eae3ca05f3970e36f26e538146539049607ed5121b06068a'
'f6cba3f7e7f35c3d811f548af9ff2044764b6b65eb9bd74f035904c0c8463651'
'7fd98f2d7700996041a835551a746cc8e6ab1048c7b297db9ac5c5534dd87d86')
@@ -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() {
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"
-# --------------------------------------------------