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

[Andreas Radke]

    Date: Thursday, March 17, 2022 @ 20:14:17
  Author: andyrtr
Revision: 439873

upgpkg: man-db 2.10.2-1: upstream update 2.10.2; enable debug

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-17 19:40:28 UTC (rev 439872)
+++ PKGBUILD	2022-03-17 20:14:17 UTC (rev 439873)
@@ -2,7 +2,7 @@
 # Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.10.1
+pkgver=2.10.2
 pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('x86_64')
@@ -15,27 +15,18 @@
 conflicts=('man')
 provides=('man')
 replaces=('man')
+options=('debug')
 install=${pkgname}.install
 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=('25a3c4e3d7b171faf0771885a7a7d502c4af801881777231c79d7ee9768c2e48e44afbf5603af13f5ac63e6981cfdb8e36ba8a33d5f926d8122635cf45fcff7a'
+sha512sums=('5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf'
             '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 \
@@ -43,6 +34,7 @@
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-snapdir=/var/lib/snapd/snap \
     --with-db=gdbm \
     --disable-setuid \
     --enable-cache-owner=root \

Deleted: snapdir.diff
===================================================================
--- snapdir.diff	2022-03-17 19:40:28 UTC (rev 439872)
+++ snapdir.diff	2022-03-17 20:14:17 UTC (rev 439873)
@@ -1,12 +0,0 @@
---- 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