[arch-commits] Commit in ubuntu-keyring/trunk (PKGBUILD)

[Felix Yan]

    Date: Sunday, April 26, 2020 @ 03:14:28
  Author: felixonmars
Revision: 621300

upgpkg: ubuntu-keyring 2020.02.11.2-1

Modified:
  ubuntu-keyring/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-26 03:13:38 UTC (rev 621299)
+++ PKGBUILD	2020-04-26 03:14:28 UTC (rev 621300)
@@ -3,8 +3,7 @@
 # Contributor: Thomas Weischuh <thomas t-8ch de>
 
 pkgname=ubuntu-keyring
-pkgver=2018.09.18.1
-_foldername=2018.09.18ubuntu1
+pkgver=2020.02.11.2
 pkgrel=1
 pkgdesc="GnuPG keys of the Ubuntu archive"
 arch=('any')
@@ -12,13 +11,10 @@
 license=('GPL')
 depends=('gnupg')
 source=("https://mirrors.kernel.org/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_$pkgver.tar.gz")
-sha512sums=('562221fc2cf4ff843e9fb16c40673e379ebaa82f12d092cff2454527a6e58ba5067abc5ef5950a82d089cad975de14cdaf01c9e29f98126da8e96a97168102f6')
+sha512sums=('e717699a6f85a07e87cb3362550ce8a0db1271d2efd85f97405c0e9139516fdf8ca473a37035b5e6e38aca9e1a29e92f4a948d51def076f9c25961c5a1d91ce1')
 
 package() {
-  cd $pkgname-$_foldername
-  install -Dm644 keyrings/ubuntu-archive-keyring.gpg "$pkgdir"/usr/share/keyrings/ubuntu-archive-keyring.gpg
-  install -Dm644 keyrings/ubuntu-archive-removed-keys.gpg "$pkgdir"/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
-  install -Dm644 keyrings/ubuntu-master-keyring.gpg "$pkgdir"/usr/share/keyrings/ubuntu-master-keyring.gpg
-  install -Dm644 keyrings/ubuntu-keyring-2012-archive.gpg "$pkgdir"/etc/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg
-  install -Dm644 keyrings/ubuntu-keyring-2012-cdimage.gpg "$pkgdir"/etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg
+  cd $pkgname-$pkgver
+  install -Dm644 keyrings/*-{keyring,keys}.gpg -t "$pkgdir"/usr/share/keyrings/
+  install -Dm644 keyrings/ubuntu-keyring-*.gpg -t "$pkgdir"/etc/apt/trusted.gpg.d/
 }