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

[David Runge]

    Date: Thursday, March 25, 2021 @ 22:57:03
  Author: dvzrv
Revision: 411004

upgpkg: ostree 2021.1-1: Upgrade to 2021.1.

Add all direct dependencies.
Add all available sodeps in package() and the respective packages in
makedepends.
Set license to GPL2.
Add python-yaml to checkdepends.
Add dracut support.
Add libsodium support.
Open upstream ticket about missing files in tarball.
Open upstream ticket about broken tests.
Validate annoted tags against upstream's PGP key
1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291.
Add libostree-1.so to provides.
Update maintainer info.

Modified:
  ostree/trunk/PKGBUILD

----------+
 PKGBUILD |   52 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-25 22:50:47 UTC (rev 411003)
+++ PKGBUILD	2021-03-25 22:57:03 UTC (rev 411004)
@@ -1,26 +1,34 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: Mirco Tischler <mt-ml at gmx dot de>
 
+_name=libostree
 pkgname=ostree
-pkgver=2020.8
+pkgver=2021.1
 pkgrel=1
 pkgdesc="Operating system and container binary deployment and upgrades"
 url="https://ostree.readthedocs.org/en/latest/"
-arch=(x86_64)
-license=(GPL)
-depends=(glib2 xz zlib libsoup gpgme libarchive fuse2 util-linux openssl avahi)
-makedepends=(e2fsprogs gobject-introspection gtk-doc libxslt systemd git python)
-checkdepends=(parallel syslinux gjs cpio elfutils)
-_commit=3e289b19345e30d2da193cd208e109f7d7aaa2a1  # tags/v2020.8^0
-source=("git+https://github.com/ostreedev/ostree#commit=$_commit"
+arch=('x86_64')
+license=('GPL2')
+depends=('fuse2' 'glibc' 'libgpg-error' 'libsodium' 'util-linux' 'openssl' 'xz'
+'zlib')
+makedepends=('avahi' 'e2fsprogs' 'git' 'glib2' 'gobject-introspection' 'gpgme'
+'gtk-doc' 'libarchive' 'libsoup' libxslt 'mkinitcpio' 'python' 'systemd')
+checkdepends=('cpio' 'elfutils' 'gjs' 'parallel' 'python-yaml' 'syslinux')
+provides=('libostree-1.so')
+source=("git+https://github.com/ostreedev/ostree#tag=v${pkgver}"
         "git+https://github.com/mendsley/bsdiff"
         "git+https://gitlab.gnome.org/GNOME/libglnx.git")
-sha256sums=('SKIP'
+sha512sums=('SKIP'
             'SKIP'
             'SKIP')
+b2sums=('SKIP'
+        'SKIP'
+        'SKIP')
+validpgpkeys=('1CEC7A9DF7DA85ABEF843DC0A866D7CCAE087291') # Colin Walters <walters at redhat.com>
 
 prepare() {
-  cd $pkgname
+  cd "$pkgname"
 
   git submodule init
   git config --local submodule.bsdiff.url "$srcdir/bsdiff"
@@ -30,13 +38,8 @@
   NOCONFIGURE=1 ./autogen.sh
 }
 
-pkgver() {
-  cd $pkgname
-  git describe | sed 's/^v//;s/-/+/g'
-}
-
 build() {
-  cd $pkgname
+  cd "$pkgname"
 
   ./configure \
     --prefix=/usr \
@@ -44,13 +47,16 @@
     --localstatedir=/var \
     --sbindir=/usr/bin \
     --libexecdir=/usr/lib \
+    --with-builtin-grub2-mkconfig \
+    --with-ed25519-libsodium \
+    --with-dracut \
     --with-mkinitcpio \
     --with-openssl \
-    --with-builtin-grub2-mkconfig \
     --enable-experimental-api \
     --disable-static \
     --enable-gtk-doc
 
+  # circumvent overlinking
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
   make
@@ -57,11 +63,15 @@
 }
 
 check() {
-  cd $pkgname
-  make check || :
+  cd "$pkgname"
+  make check -k || echo "Known to fail: https://github.com/ostreedev/ostree/issues/2313"
 }
 
 package() {
-  cd $pkgname
+  depends+=('libarchive.so' 'libavahi-client.so' 'libavahi-common.so'
+  'libavahi-glib.so' 'libgio-2.0.so' 'libglib-2.0.so' 'libgobject-2.0.so'
+  'libgpgme.so' 'libsoup-2.4.so' 'libsystemd.so')
+
+  cd "$pkgname"
   make DESTDIR="$pkgdir" install
 }