Verify sources with GPG when possible

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb81014852ec..b599a034f9fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ocaml-mew
 	pkgdesc = A general modal editing engine generator
 	pkgver = 0.1.0
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/kandu/mew
 	arch = x86_64
 	arch = aarch64
@@ -12,7 +12,8 @@ pkgbase = ocaml-mew
 	depends = ocaml-result
 	depends = ocaml-trie
 	options = !strip
-	source = ocaml-mew-0.1.0-7.tar.gz::https://github.com/kandu/mew/archive/0.1.0.tar.gz
-	sha512sums = 77a68f6dc9f3edc729384d59247a29f32f969dc6d987ed2e6c88b9a64b655822dafa9c3cb424bf40e6cf9ed20cddf9c708738872db245f14a711770e8e938db3
+	source = ocaml-mew-0.1.0::git+https://github.com/kandu/mew#commit=e2a5ca84d9c3c4142a47ef867b2bbc44083246c5?signed
+	validpgpkeys = 364216C4466A9E17A97CD5DBEECA66966D9E4261
+	sha512sums = SKIP
 
 pkgname = ocaml-mew
diff --git a/PKGBUILD b/PKGBUILD
index b492b4349d74..5124eb7773b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 _projectname='mew'
 pkgname="ocaml-$_projectname"
 pkgver='0.1.0'
-pkgrel='7'
+_commit='e2a5ca84d9c3c4142a47ef867b2bbc44083246c5'
+pkgrel='8'
 pkgdesc='A general modal editing engine generator'
 arch=('x86_64' 'aarch64')
 url="https://github.com/kandu/$_projectname"
@@ -11,10 +12,11 @@ depends=('ocaml>=4.02.3' 'ocaml-result' 'ocaml-trie')
 makedepends=('dune>=1.1.0')
 checkdepends=('ocaml-ppx_expect')
 options=('!strip')
-source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz")
-sha512sums=('77a68f6dc9f3edc729384d59247a29f32f969dc6d987ed2e6c88b9a64b655822dafa9c3cb424bf40e6cf9ed20cddf9c708738872db245f14a711770e8e938db3')
+source=("$pkgname-$pkgver::git+$url#commit=$_commit?signed")
+sha512sums=('SKIP')
+validpgpkeys=('364216C4466A9E17A97CD5DBEECA66966D9E4261') # ZAN DoYe <zandoye@gmail.com> (https://github.com/kandu.gpg)
 
-_sourcedirectory="$_projectname-$pkgver"
+_sourcedirectory="$pkgname-$pkgver"
 
 build() {
 	cd "$srcdir/$_sourcedirectory/"
@@ -30,6 +32,10 @@ package() {
 	cd "$srcdir/$_sourcedirectory/"
 	DESTDIR="$pkgdir" dune install --prefix '/usr' --libdir '/usr/lib/ocaml' --docdir '/usr/share/doc' --mandir '/usr/share/man' --release --verbose
 
+	for _folder in "$pkgdir/usr/share/doc/"*; do
+		mv "$_folder" "$pkgdir/usr/share/doc/ocaml-$(basename "$_folder")"
+	done
+
 	install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
 	ln -sf "/usr/share/doc/$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }