update PKGBUILD and sync with git version, version alpha 7

2 files changed, 27 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 992bdff739b3..1bcf69d0f3b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = kanidm
 	pkgdesc = A identity management service and clients.
-	pkgver = 1.1.0_alpha.6
+	pkgver = 1.1.0_alpha.7
 	pkgrel = 1
 	url = https://github.com/kanidm/kanidm
 	arch = x86_64
 	arch = aarch64
 	license = MPL-2.0
 	makedepends = cargo
-	source = kanidm-1.1.0_alpha.6.tar.gz::https://github.com/kanidm/kanidm/archive/refs/tags/v1.1.0-alpha.6.tar.gz
-	sha256sums = 7933af90efc70f55e12a2a2387ed986386f6a1a92e038feb380c7d7fcdebd160
+	makedepends = systemd
+	source = kanidm-1.1.0_alpha.7.tar.gz::https://github.com/kanidm/kanidm/archive/refs/tags/v1.1.0-alpha.7.tar.gz
+	sha256sums = d80def7b495aaa991706b8a088e9d7c1ac74346bd34329a54a43692848e683a3
 
 pkgname = kanidm
-	depends = kanidm-server=1.1.0_alpha.6
-	depends = kanidm-clients=1.1.0_alpha.6
-	depends = kanidm-unixd-clients=1.1.0_alpha.6
+	depends = kanidm-server=1.1.0_alpha.7
+	depends = kanidm-clients=1.1.0_alpha.7
+	depends = kanidm-unixd-clients=1.1.0_alpha.7
 	conflicts = kanidm-git
 
 pkgname = kanidm-clients
diff --git a/PKGBUILD b/PKGBUILD
index 96c70cca676a..bbd141759065 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,6 @@
 # 
 # * check the systemd units on their preconditions, especially nptd, ... 
 #   as they are a copy of suse service files from https://build.opensuse.org/package/view_file/home:firstyear:kanidm/kanidm:w
-# * systemd activate and run should be added to package if this is so with other arch packages 
 # 
 # if somebody wants to maintain or contribute, just drop a note, i will add you.
 
@@ -17,7 +16,7 @@ pkgname=(
 	$_basename-server
 	$_basename-unixd-clients
 )
-pkgver=1.1.0_alpha.6
+pkgver=1.1.0_alpha.7
 _realver=${pkgver/_/-}
 pkgrel=1
 pkgdesc='A identity management service and clients.'
@@ -25,8 +24,8 @@ url='https://github.com/kanidm/kanidm'
 source=("$_basename-$pkgver.tar.gz::https://github.com/$_basename/$_basename/archive/refs/tags/v${_realver}.tar.gz")
 arch=(x86_64 aarch64)
 license=(MPL-2.0)
-makedepends=(cargo)
-sha256sums=('7933af90efc70f55e12a2a2387ed986386f6a1a92e038feb380c7d7fcdebd160')
+makedepends=(cargo systemd)
+sha256sums=('d80def7b495aaa991706b8a088e9d7c1ac74346bd34329a54a43692848e683a3')
 
 
 build () {
@@ -34,11 +33,6 @@ build () {
 
   export KANIDM_BUILD_PROFILE="release_suse_x86_64"
   cargo build --locked --release --target-dir target
-
-  # Now, move the completions to easier to install locations.
-  mkdir -p target/release/_completions
-  cp target/release/build/*/out/_kanidm* target/release/_completions/
-  cp target/release/build/*/out/kanidm*.bash target/release/_completions/
 }
 
 package_kanidm () {
@@ -62,9 +56,9 @@ package_kanidm-clients () {
 
   install -Dm755 target/release/kanidm "${pkgdir}/usr/bin/kanidm"
 
-  install -Dm644 target/release/_completions/_kanidm "${pkgdir}/usr/share/zsh/site-functions/_kanidm"
+  install -Dm644 target/release/build/completions/_kanidm "${pkgdir}/usr/share/zsh/site-functions/_kanidm"
 
-  install -Dm644 target/release/_completions/kanidm.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm.sh"
+  install -Dm644 target/release/build/completions/kanidm.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm.sh"
 }
 
 package_kanidm-server () {
@@ -81,11 +75,11 @@ package_kanidm-server () {
   install -Dm755 target/release/kanidmd "${pkgdir}/usr/bin/kanidmd"
   install -Dm755 target/release/kanidm_badlist_preprocess "${pkgdir}/usr/bin/kanidm_badlist_preprocess"
 
-  install -Dm644 target/release/_completions/_kanidmd "${pkgdir}/usr/share/zsh/site-functions/_kanidmd"
-  install -Dm644 target/release/_completions/_kanidm_badlist_preprocess "${pkgdir}/usr/share/zsh/site-functions/_kanidm_badlist_preprocess"
+  install -Dm644 target/release/build/completions/_kanidmd "${pkgdir}/usr/share/zsh/site-functions/_kanidmd"
+  install -Dm644 target/release/build/completions/_kanidm_badlist_preprocess "${pkgdir}/usr/share/zsh/site-functions/_kanidm_badlist_preprocess"
 
-  install -Dm644 target/release/_completions/kanidmd.bash "${pkgdir}/usr/share/bash-completion/completions/kanidmd.sh"
-  install -Dm644 target/release/_completions/kanidm_badlist_preprocess.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_badlist_preprocess.sh"
+  install -Dm644 target/release/build/completions/kanidmd.bash "${pkgdir}/usr/share/bash-completion/completions/kanidmd.sh"
+  install -Dm644 target/release/build/completions/kanidm_badlist_preprocess.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_badlist_preprocess.sh"
 
   # add web-ui files
   install -dv "${pkgdir}/usr/share/kanidm/ui/"
@@ -115,15 +109,15 @@ package_kanidm-unixd-clients () {
   install -Dm755 target/release/kanidm_unixd_status "${pkgdir}/usr/bin/kanidm_unixd_status"
   install -Dm755 target/release/kanidm_unixd_tasks "${pkgdir}/usr/bin/kanidm_unixd_tasks"
 
-  install -Dm644 target/release/_completions/_kanidm_ssh_authorizedkeys_direct "${pkgdir}/usr/share/zsh/site-functions/_kanidm_ssh_authorizedkeys_direct"
-  install -Dm644 target/release/_completions/_kanidm_cache_clear "${pkgdir}/usr/share/zsh/site-functions/_kanidm_cache_clear"
-  install -Dm644 target/release/_completions/_kanidm_cache_invalidate "${pkgdir}/usr/share/zsh/site-functions/_kanidm_cache_invalidate"
-  install -Dm644 target/release/_completions/_kanidm_ssh_authorizedkeys "${pkgdir}/usr/share/zsh/site-functions/_kanidm_ssh_authorizedkeys"
-  install -Dm644 target/release/_completions/_kanidm_unixd_status "${pkgdir}/usr/share/zsh/site-functions/_kanidm_unixd_status"
-
-  install -Dm644 target/release/_completions/kanidm_ssh_authorizedkeys_direct.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_ssh_authorizedkeys_direct.sh"
-  install -Dm644 target/release/_completions/kanidm_cache_clear.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_cache_clear.sh"
-  install -Dm644 target/release/_completions/kanidm_cache_invalidate.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_cache_invalidate.sh"
-  install -Dm644 target/release/_completions/kanidm_ssh_authorizedkeys.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_ssh_authorizedkeys.sh"
-  install -Dm644 target/release/_completions/kanidm_unixd_status.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_unixd_status.sh"
+  install -Dm644 target/release/build/completions/_kanidm_ssh_authorizedkeys_direct "${pkgdir}/usr/share/zsh/site-functions/_kanidm_ssh_authorizedkeys_direct"
+  install -Dm644 target/release/build/completions/_kanidm_cache_clear "${pkgdir}/usr/share/zsh/site-functions/_kanidm_cache_clear"
+  install -Dm644 target/release/build/completions/_kanidm_cache_invalidate "${pkgdir}/usr/share/zsh/site-functions/_kanidm_cache_invalidate"
+  install -Dm644 target/release/build/completions/_kanidm_ssh_authorizedkeys "${pkgdir}/usr/share/zsh/site-functions/_kanidm_ssh_authorizedkeys"
+  install -Dm644 target/release/build/completions/_kanidm_unixd_status "${pkgdir}/usr/share/zsh/site-functions/_kanidm_unixd_status"
+
+  install -Dm644 target/release/build/completions/kanidm_ssh_authorizedkeys_direct.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_ssh_authorizedkeys_direct.sh"
+  install -Dm644 target/release/build/completions/kanidm_cache_clear.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_cache_clear.sh"
+  install -Dm644 target/release/build/completions/kanidm_cache_invalidate.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_cache_invalidate.sh"
+  install -Dm644 target/release/build/completions/kanidm_ssh_authorizedkeys.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_ssh_authorizedkeys.sh"
+  install -Dm644 target/release/build/completions/kanidm_unixd_status.bash "${pkgdir}/usr/share/bash-completion/completions/kanidm_unixd_status.sh"
 }