[arch-commits] Commit in libldm/trunk (PKGBUILD ldmtool.service)

[Maxime Gauduin]

    Date: Tuesday, March 24, 2020 @ 12:39:47
  Author: alucryd
Revision: 603806

FS#64748: libldm 0.2.4.r20.a856552-1

Modified:
  libldm/trunk/PKGBUILD
  libldm/trunk/ldmtool.service

-----------------+
 PKGBUILD        |   53 ++++++++++++++++++++++++++++++++++++-----------------
 ldmtool.service |    8 ++++++--
 2 files changed, 42 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-24 10:51:39 UTC (rev 603805)
+++ PKGBUILD	2020-03-24 12:39:47 UTC (rev 603806)
@@ -3,26 +3,45 @@
 # Contributor: Neal Buchanan <neal.buchanan at gmx.com>
 
 pkgname=libldm
-pkgver=0.2.4
-pkgrel=3
+pkgver=0.2.4.r20.a856552
+pkgrel=1
 pkgdesc='A tool and library for managing Microsoft Windows Dynamic Disks'
-arch=('x86_64')
-url='https://github.com/mdbooth/libldm'
-license=('GPL3' 'LGPL3')
-depends=('device-mapper' 'glib2' 'json-glib' 'zlib'
-         'libreadline.so' 'libuuid.so')
-makedepends=('git' 'gtk-doc')
-provides=('ldmtool' 'libldm-1.0.so')
-conflicts=('ldmtool')
-source=("git+https://github.com/mdbooth/libldm.git#tag=libldm-${pkgver}"
-        'ldmtool.service')
-sha256sums=('SKIP'
-            '7feca8b7b8561b2572e23c82a889fd665a25aabddfed336caf13c4bcb053d99e')
+arch=(x86_64)
+url=https://github.com/mdbooth/libldm
+license=(
+  GPL3
+  LGPL3
+)
+depends=(
+  device-mapper
+  glib2
+  json-glib
+  libreadline.so
+  libuuid.so
+  zlib
+)
+makedepends=(
+  git
+  gtk-doc
+)
+provides=(
+  ldmtool
+  libldm-1.0.so
+)
+conflicts=(ldmtool)
+source=(
+  git+https://github.com/mdbooth/libldm.git#commit=a856552670944b4dbb28740aa42e58ffa8434803
+  ldmtool.service
+)
+sha256sums=(
+  SKIP
+  bc191523e702b9f8813d93f9e37693e6b97d9adf7eada5463c29fbf1b46c6f2a
+)
 
-prepare() {
+pkgver() {
   cd libldm
 
-  git cherry-pick -n ee1b37a034038f09d61b121cc8b3651024acc46f # FS#60486
+  git describe --tags | sed 's/^libldm-//; s/-/.r/; s/-g/./'
 }
 
 build() {
@@ -29,7 +48,7 @@
   cd libldm
 
   ./autogen.sh \
-    --prefix='/usr'
+    --prefix=/usr
   make
 }
 

Modified: ldmtool.service
===================================================================
--- ldmtool.service	2020-03-24 10:51:39 UTC (rev 603805)
+++ ldmtool.service	2020-03-24 12:39:47 UTC (rev 603806)
@@ -1,9 +1,13 @@
 [Unit]
-Description=Windows Dynamic Disks Mount
+Description=Windows Dynamic Disk Mount
 Before=local-fs-pre.target
 DefaultDependencies=no
 
 [Service]
-Type=oneshot
+Type=simple
+User=root
 ExecStart=/usr/bin/ldmtool create all
 
+[Install]
+WantedBy=local-fs-pre.target
+