From f0403a657e8708a03287088b41a069736500c28f Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Fri, 22 Jul 2022 14:57:52 +0200
Subject: [PATCH] Actually build a released preserves-tools

---
 packaging/packages/preserves-tools/APKBUILD   | 33 +------------------
 .../packages/preserves-tools/APKBUILD.adhoc   | 32 ++++++++++++++++++
 .../preserves-tools/APKBUILD.released         | 26 +++++++++++++++
 3 files changed, 59 insertions(+), 32 deletions(-)
 mode change 100644 => 120000 packaging/packages/preserves-tools/APKBUILD
 create mode 100644 packaging/packages/preserves-tools/APKBUILD.adhoc
 create mode 100644 packaging/packages/preserves-tools/APKBUILD.released

diff --git a/packaging/packages/preserves-tools/APKBUILD b/packaging/packages/preserves-tools/APKBUILD
deleted file mode 100644
index efba99b..0000000
--- a/packaging/packages/preserves-tools/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
-pkgname=preserves-tools
-pkgver=2.4.0
-pkgrel=0
-pkgdesc="Command-line tools for working with Preserves documents"
-url="https://preserves.dev/"
-arch="all"
-license="GPLv3"
-depends=""
-makedepends=""
-source="
-preserves-tool.aarch64
-preserves-tool.armv7
-preserves-tool.x86_64
-"
-builddir="$srcdir/"
-options="!check"
-
-build() {
-    :
-}
-
-package() {
-    mkdir -p "$pkgdir/usr/bin"
-    cp -p preserves-tool.${CARCH} "$pkgdir/usr/bin/preserves-tool"
-}
-sha512sums="
-0a9f8b80ed78470dfe532e95c114f633db4f5526e579de4b60d9d3c99afa6d1210838dad21518cb0ce4d5413152bc0264a6eaec574b9422d8d69c2c895f34b6e  preserves-tool.aarch64
-7e14e389483a93b9c640c00f2b8d0ebc88b1c814369c925ce99f9a4e023346ab0a35a294c2d5a42d0a9ace75271fc57aca52b0971a9e2888230c8ea99fd562e5  preserves-tool.armv7
-526a77a2dd1356f486b3fc199cf014b21ac565b333f01f4475e42a3d62fb43f986c6701f3b6dd10e18fcaa3866149ce192149685a1073a89cd48f86844f5b69e  preserves-tool.x86_64
-"
diff --git a/packaging/packages/preserves-tools/APKBUILD b/packaging/packages/preserves-tools/APKBUILD
new file mode 120000
index 0000000..03734c8
--- /dev/null
+++ b/packaging/packages/preserves-tools/APKBUILD
@@ -0,0 +1 @@
+APKBUILD.released
\ No newline at end of file
diff --git a/packaging/packages/preserves-tools/APKBUILD.adhoc b/packaging/packages/preserves-tools/APKBUILD.adhoc
new file mode 100644
index 0000000..efba99b
--- /dev/null
+++ b/packaging/packages/preserves-tools/APKBUILD.adhoc
@@ -0,0 +1,32 @@
+# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+pkgname=preserves-tools
+pkgver=2.4.0
+pkgrel=0
+pkgdesc="Command-line tools for working with Preserves documents"
+url="https://preserves.dev/"
+arch="all"
+license="GPLv3"
+depends=""
+makedepends=""
+source="
+preserves-tool.aarch64
+preserves-tool.armv7
+preserves-tool.x86_64
+"
+builddir="$srcdir/"
+options="!check"
+
+build() {
+    :
+}
+
+package() {
+    mkdir -p "$pkgdir/usr/bin"
+    cp -p preserves-tool.${CARCH} "$pkgdir/usr/bin/preserves-tool"
+}
+sha512sums="
+0a9f8b80ed78470dfe532e95c114f633db4f5526e579de4b60d9d3c99afa6d1210838dad21518cb0ce4d5413152bc0264a6eaec574b9422d8d69c2c895f34b6e  preserves-tool.aarch64
+7e14e389483a93b9c640c00f2b8d0ebc88b1c814369c925ce99f9a4e023346ab0a35a294c2d5a42d0a9ace75271fc57aca52b0971a9e2888230c8ea99fd562e5  preserves-tool.armv7
+526a77a2dd1356f486b3fc199cf014b21ac565b333f01f4475e42a3d62fb43f986c6701f3b6dd10e18fcaa3866149ce192149685a1073a89cd48f86844f5b69e  preserves-tool.x86_64
+"
diff --git a/packaging/packages/preserves-tools/APKBUILD.released b/packaging/packages/preserves-tools/APKBUILD.released
new file mode 100644
index 0000000..8bf7cd6
--- /dev/null
+++ b/packaging/packages/preserves-tools/APKBUILD.released
@@ -0,0 +1,26 @@
+# Contributor: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+# Maintainer: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
+pkgname=preserves-tools
+pkgver=2.5.0
+pkgrel=0
+pkgdesc="Command-line tools for working with Preserves documents"
+url="https://preserves.dev/"
+arch="all"
+license="GPLv3"
+depends=""
+makedepends="cargo"
+source="$pkgname-$pkgver.tar.gz::https://gitlab.com/preserves/preserves/-/archive/rust-preserves-tools@$pkgver/preserves-rust-preserves-tools@$pkgver.tar.gz"
+builddir="$srcdir/preserves-rust-preserves-tools@$pkgver/implementations/rust/"
+options="!check"
+
+build() {
+        (cd preserves-tools; cargo build --release)
+}
+
+package() {
+        install -Dm755 "target/release/preserves-tool" "$pkgdir/usr/bin/preserves-tool"
+}
+
+sha512sums="
+8b41994a413fd138503abe2c95a4c1ad15f87298d8319e1f0f3127321adc8a93061d68d69824f3149b02bc3be2ebc27f0ed406c541add61b9420f7bea3f8ce2f  preserves-tools-2.5.0.tar.gz
+"