[arch-commits] Commit in podman/repos/community-x86_64 (PKGBUILD PKGBUILD)

[David Runge]

    Date: Tuesday, November 24, 2020 @ 17:57:13
  Author: dvzrv
Revision: 760995

archrelease: copy trunk to community-x86_64

Added:
  podman/repos/community-x86_64/PKGBUILD
    (from rev 760994, podman/trunk/PKGBUILD)
Deleted:
  podman/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  112 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 58 insertions(+), 54 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-24 17:57:03 UTC (rev 760994)
+++ PKGBUILD	2020-11-24 17:57:13 UTC (rev 760995)
@@ -1,54 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-
-pkgbase=podman
-pkgname=(podman podman-docker)
-pkgver=2.1.1
-pkgrel=1
-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)
-source=("git+$url#tag=v$pkgver?signed")
-validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4')
-sha256sums=('SKIP')
-
-pkgver() {
-  cd libpod
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
-  export BUILDTAGS='seccomp varlink systemd'
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath"
-
-  cd libpod
-  go generate ./pkg/varlink/...
-  make EXTRA_LDFLAGS='-s -w -linkmode=external'
-}
-
-package_podman() {
-  optdepends+=('podman-docker: for Docker-compatible CLI'
-              'btrfs-progs: support btrfs backend devices'
-              'catatonit: --init flag support'
-              'crun: support for unified cgroupsv2')
-
-  cd libpod
-  make install install.completions DESTDIR="$pkgdir" PREFIX=/usr
-}
-
-package_podman-docker() {
-  pkgdesc='Emulate Docker CLI using podman'
-  depends=(podman)
-  conflicts=(docker)
-
-  cd libpod
-  make install.docker DESTDIR="$pkgdir" PREFIX=/usr
-}

Copied: podman/repos/community-x86_64/PKGBUILD (from rev 760994, podman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-24 17:57:13 UTC (rev 760995)
@@ -0,0 +1,58 @@
+# 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=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 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')
+
+pkgver() {
+  cd libpod
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+build() {
+  export BUILDTAGS='seccomp varlink systemd'
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath"
+
+  cd libpod
+  go generate ./pkg/varlink/...
+  make EXTRA_LDFLAGS='-s -w -linkmode=external'
+}
+
+package_podman() {
+  depends+=('libgpgme.so')
+  optdepends+=('podman-docker: for Docker-compatible CLI'
+              'btrfs-progs: support btrfs backend devices'
+              'catatonit: --init flag support'
+              'crun: support for unified cgroupsv2')
+
+  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() {
+  pkgdesc='Emulate Docker CLI using podman'
+  depends=(podman)
+  conflicts=(docker)
+
+  cd libpod
+  make install.docker DESTDIR="$pkgdir" PREFIX=/usr
+}