[arch-commits] Commit in man-db/trunk (PKGBUILD snapdir.diff)

[Andreas Radke]

    Date: Wednesday, February 26, 2020 @ 06:51:06
  Author: andyrtr
Revision: 376242

upgpkg: man-db 2.9.1-1: upstream update 2.9.1

Added:
  man-db/trunk/snapdir.diff
Modified:
  man-db/trunk/PKGBUILD

--------------+
 PKGBUILD     |   14 ++++++++++++--
 snapdir.diff |   12 ++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-25 20:00:31 UTC (rev 376241)
+++ PKGBUILD	2020-02-26 06:51:06 UTC (rev 376242)
@@ -2,7 +2,7 @@
 # Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.9.0
+pkgver=2.9.1
 pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('x86_64')
@@ -19,13 +19,23 @@
 source=(https://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.asc}
         # fallback should be used within first 24h after a release
         #https://download-mirror.savannah.gnu.org/releases/man-db/$pkgname-$pkgver.tar.xz{,.asc} 
+        snapdir.diff
         convert-mans
 )
 validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson at debian.org>
-sha512sums=('7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda'
+sha512sums=('ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977'
             'SKIP'
+            'f24a8152c82c3b99dab2c34654382512f226bb6b0e5e3b1376d577019a4cca0f4e5a9ac92c62ed7ea5cf0ed3ad94509d34f455d845bc5fb026ef908da82cd5fe'
             '0b159285da20008f0fc0afb21f1eaebd39e8df5b0594880aa0e8a913b656608b8d16bb8d279d9e62d7aae52f62cb9b2fc49e237c6711f4a5170972b38d345535')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix default Add MANDB_MAP entry mapping /snap/man to /var/cache/man/snap
+  # Arch needs /var/lib/snapd/snap/man to /var/cache/man/snap
+  patch -Np0 -i ../snapdir.diff
+}
+
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \

Added: snapdir.diff
===================================================================
--- snapdir.diff	                        (rev 0)
+++ snapdir.diff	2020-02-26 06:51:06 UTC (rev 376242)
@@ -0,0 +1,12 @@
+--- src/man_db.conf.in	2020-01-27 13:25:03.000000000 +0100
++++ src/man_db.conf.in.new	2020-02-26 07:40:32.726347889 +0100
+@@ -69,7 +69,8 @@
+ MANDB_MAP	/usr/local/share/man	/var/cache/man/local
+ MANDB_MAP	/usr/X11R6/man		/var/cache/man/X11R6
+ MANDB_MAP	/opt/man		/var/cache/man/opt
+-MANDB_MAP	/snap/man		/var/cache/man/snap
++MANDB_MAP	/var/lib/snapd/snap/man	/var/cache/man/snap
++
+ #
+ #---------------------------------------------------------
+ # Program definitions.  These are commented out by default as the value