[arch-commits] Commit in desktop-file-utils/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, February 25, 2022 @ 16:42:09
  Author: heftig
Revision: 438133

0.26-2: Add fixes for spec 1.5

Modified:
  desktop-file-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-25 15:00:13 UTC (rev 438132)
+++ PKGBUILD	2022-02-25 16:42:09 UTC (rev 438133)
@@ -1,9 +1,10 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=desktop-file-utils
 pkgver=0.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Command line utilities for working with desktop entries"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/desktop-file-utils"
@@ -15,15 +16,18 @@
         update-desktop-database.hook)
 sha256sums=('SKIP'
             '501f1eb35d9fbbd61666f40302b0ce63425299edf023c075986a24dc3ef18575')
-validpgpkeys=('C01EDE5BB0D91E26D003662EC76BB9FEEAD12EA7') #Hans Petter Jansson <hpj at suse.com>
+validpgpkeys=('C01EDE5BB0D91E26D003662EC76BB9FEEAD12EA7') # Hans Petter Jansson <hpj at cl.no>
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
+
+  # Support Desktop Entry Spec 1.5
+  git cherry-pick -n 425177a28b62 56d220dd679c
 }
 
 build() {
@@ -38,7 +42,7 @@
 package() {
   depends+=(libglib-2.0.so)
 
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
 }