[arch-commits] Commit in podman/trunk (PKGBUILD)

[David Runge]

    Date: Tuesday, November 24, 2020 @ 17:57:03
  Author: dvzrv
Revision: 760994

upgpkg: podman 2.1.1-2: Rebuild to remove duplicate man pages.

Remove man pages now provided by containers-common.
Instead of depending on skopeo, depend on containers-common.
Add libgpgme.so to depends for podman (as it was missing).

Modified:
  podman/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-24 17:45:28 UTC (rev 760993)
+++ PKGBUILD	2020-11-24 17:57:03 UTC (rev 760994)
@@ -1,17 +1,18 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: David Runge <dvzrv at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
 pkgbase=podman
 pkgname=(podman podman-docker)
 pkgver=2.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Tool and library for running OCI-based containers in pods'
 arch=(x86_64)
 url='https://github.com/containers/libpod'
 license=(Apache)
-depends=(cni-plugins conmon device-mapper iptables libseccomp runc
-         slirp4netns libsystemd fuse-overlayfs skopeo)
-makedepends=(go go-md2man git btrfs-progs)
+depends=(cni-plugins conmon containers-common device-mapper iptables libseccomp
+runc slirp4netns libsystemd fuse-overlayfs)
+makedepends=(btrfs-progs go go-md2man git gpgme systemd)
 source=("git+$url#tag=v$pkgver?signed")
 validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4')
 sha256sums=('SKIP')
@@ -35,6 +36,7 @@
 }
 
 package_podman() {
+  depends+=('libgpgme.so')
   optdepends+=('podman-docker: for Docker-compatible CLI'
               'btrfs-progs: support btrfs backend devices'
               'catatonit: --init flag support'
@@ -42,6 +44,8 @@
 
   cd libpod
   make install install.completions DESTDIR="$pkgdir" PREFIX=/usr
+  # remove man pages provided by containers-common
+  rm -rvf "${pkgdir}/usr/share/man/man5"
 }
 
 package_podman-docker() {