From 2e500f2a2ce194d7db0a527d15960f503527bf4d Mon Sep 17 00:00:00 2001
From: Xavier <sapphirus@azorium.net>
Date: Sun, 31 Mar 2024 00:35:40 -0400
Subject: [PATCH] Bump to 0.8.0

- Bumped to stable tarball release 0.8.0
- Overhauled PKGBUILD to be inline with the current pacwrap-git HEAD
---
 .SRCINFO | 12 +++++++----
 PKGBUILD | 64 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5aec775..e78d274 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pacwrap
 	pkgdesc = Facilitates the creation, management, and execution of unprivileged Arch-based bubblewrap containers.
-	pkgver = 0.7.2
+	pkgver = 0.8.0
 	pkgrel = 1
 	url = https://pacwrap.sapphirus.org/
 	arch = x86_64
@@ -9,23 +9,27 @@ pkgbase = pacwrap
 	makedepends = git
 	makedepends = fakeroot
 	makedepends = pacman
+	makedepends = libalpm.so>=14
 	makedepends = zstd
 	makedepends = busybox
 	makedepends = fakechroot
 	options = !lto
-	source = pacwrap-0.7.2.tar.zst::https://github.com/pacwrap/pacwrap/releases/download/0.7.2/pacwrap-0.7.2.tar.zst
-	sha512sums = eea9177b2d7065915a6e0dd911881242f9690509e710a66eb3114cf9459668c839f983580d87f7d4e161006ca06df1b3572769ccdf52430f84061a20e94302e4
+	source = pacwrap-0.8.0.tar.zst::https://github.com/pacwrap/pacwrap/releases/download/0.8.0/pacwrap-0.8.0.tar.zst
+	sha512sums = 832139cd18e276c46fed275e8d4b6bdf215ce14ab9d8cf39d1ffc93bde952028b2a9cb2c4b635170b3093ed0a6f8e46c1a9dd6874c54a283c0913c27c0df14e9
 
 pkgname = pacwrap
 	depends = bash
 	depends = bubblewrap
 	depends = gnupg
 	depends = pacman
+	depends = libalpm.so>=14
 	depends = libseccomp
-	depends = pacwrap-dist=0.7.2
+	depends = pacwrap-dist=0.8.0
 	depends = zstd
 	optdepends = xdg-dbus-proxy
 	provides = pacwrap
+	conflicts = pacwrap
 
 pkgname = pacwrap-dist
 	provides = pacwrap-dist
+	conflicts = pacwrap-dist
diff --git a/PKGBUILD b/PKGBUILD
index 0a200e3..6ca3a79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,58 @@
 # Maintainer: Xavier R.M. (sapphirus at azorium dot net)
 
+_pkgname=pacwrap
 pkgname=('pacwrap' 'pacwrap-dist')
-pkgver=0.7.2
+pkgver=0.8.0
 pkgrel=1
+_pkgbase=${pkgname}-${pkgver}
 pkgdesc="Facilitates the creation, management, and execution of unprivileged Arch-based bubblewrap containers."
 arch=('x86_64')
 url="https://pacwrap.sapphirus.org/"
 license=('GPLv3-only')
-makedepends=('cargo' 'git' 'fakeroot' 'pacman' 'zstd' 'busybox' 'fakechroot')
-source=("${pkgname}-${pkgver}.tar.zst::https://github.com/pacwrap/pacwrap/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.zst")
-sha512sums=('eea9177b2d7065915a6e0dd911881242f9690509e710a66eb3114cf9459668c839f983580d87f7d4e161006ca06df1b3572769ccdf52430f84061a20e94302e4')
+makedepends=('cargo' 'git' 'fakeroot' 'pacman' 'libalpm.so>=14' 'zstd' 'busybox' 'fakechroot')
+source=("${_pkgbase}.tar.zst::https://github.com/pacwrap/pacwrap/releases/download/${pkgver}/${_pkgbase}.tar.zst")
+sha512sums=('832139cd18e276c46fed275e8d4b6bdf215ce14ab9d8cf39d1ffc93bde952028b2a9cb2c4b635170b3093ed0a6f8e46c1a9dd6874c54a283c0913c27c0df14e9')
 options=('!lto')
 
 prepare() {
-  	cd "${srcdir}"
-  	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-	./dist/tools/schema.sh release
+    cd "${_pkgbase}" 	
+    cargo fetch --locked --target "$CARCH-unknown-linux-gnu" \
+    && ./dist/tools/prepare.sh release
 }
 
 build() {
-  	cd "${srcdir}"
-	PACWRAP_SCHEMA_BUILT=1 \
-	cargo build --release --frozen
-	./dist/tools/runtime.sh release
-	./target/release/pacwrap --help=all --format=man > ./pacwrap.1
-	./target/release/pacwrap --help=pacwrap.yml --format=man > ./pacwrap.yml.2
+    cd "${_pkgbase}"
+    PACWRAP_SCHEMA_BUILT=1 \
+    cargo build --release --frozen \
+    && ./dist/tools/package.sh release
 }
 
 package_pacwrap() {
-	provides=('pacwrap')
-	depends=('bash' 'bubblewrap' 'gnupg' 'pacman' 'libseccomp' "pacwrap-dist=$pkgver" 'zstd')
+	provides=("${_pkgname}")
+	conflicts=("${_pkgname}")
+	depends=('bash' 'bubblewrap' 'gnupg' 'pacman' 'libalpm.so>=14' 'libseccomp' "pacwrap-dist=$pkgver" 'zstd')
 	optdepends=('xdg-dbus-proxy')
 
-	install -d "${pkgdir}/usr/share/pacwrap"	
-	install -Dm 755 "target/release/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-   	install -Dm 755 "bin/${pkgname}-common" "${pkgdir}/usr/bin/${pkgname}-common"
-   	install -Dm 755 "bin/${pkgname}-utils" "${pkgdir}/usr/bin/${pkgname}-utils"
-	install -Dm 644 "pacwrap.1" "${pkgdir}/usr/share/man/man1/pacwrap.1"
-	install -Dm 644 "pacwrap.yml.2" "${pkgdir}/usr/share/man/man2/pacwrap.yml.2"
-	install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  	cd "${_pkgbase}"
+
+	install -d "${pkgdir}/usr/share/${_pkgname}"	
+	install -Dm 755 "target/release/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+  	install -Dm 755 "dist/bin/${_pkgname}-key" "${pkgdir}/usr/bin/${_pkgname}-key"
+	install -Dm 644 "dist/bin/${_pkgname}.1" "${pkgdir}/usr/share/man/man1/${_pkgname}.1"
+	install -Dm 644 "dist/bin/${_pkgname}.yml.2" "${pkgdir}/usr/share/man/man2/${_pkgname}.yml.2"
+	install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
 
 package_pacwrap-dist() {
-	provides=('pacwrap-dist')
+	provides=("${_pkgname}-dist")
+	conflicts=("${_pkgname}-dist")
 
-	install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -d "${pkgdir}/usr/share/pacwrap" 	
-	
-	cd dist
-	cp -r "filesystem.tar.zst" "${pkgdir}/usr/share/pacwrap"
-	cp -r "filesystem.dat" "${pkgdir}/usr/share/pacwrap"	
-	cp -r "runtime" "${pkgdir}/usr/share/pacwrap"
+  	cd "${_pkgbase}"
+
+	install -dD 755 "${pkgdir}/usr/share/${_pkgname}/"
+	install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}-dist/LICENSE"
+	install -Dm 644 "dist/bin/filesystem.tar.zst" "${pkgdir}/usr/share/${_pkgname}/filesystem.tar.zst"
+	install -Dm 644 "dist/bin/filesystem.dat" "${pkgdir}/usr/share/${_pkgname}/filesystem.dat"
+
+	cp -r "dist/runtime" "${pkgdir}/usr/share/${_pkgname}/"
 }