From 476f6f5df697709870d15ddda8875af789f9edb0 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 18 Aug 2015 13:37:42 +0200 Subject: testing/shadow: fix conflict with man-pages --- testing/shadow/APKBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'testing/shadow') diff --git a/testing/shadow/APKBUILD b/testing/shadow/APKBUILD index a7b9e2c44a..2dd17dee2f 100644 --- a/testing/shadow/APKBUILD +++ b/testing/shadow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall pkgname=shadow pkgver=4.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="PAM-using login and passwd utilities (usermod / useradd / newuidmap etc)" url="http://pkg-shadow.alioth.debian.org/" arch="all" @@ -57,6 +57,10 @@ package() { # /etc/login.defs is not very useful - replace it with a blank file rm "$pkgdir"/etc/login.defs touch "$pkgdir"/etc/login.defs + + # avoid conflict with man-pages + rm "$pkgdir"/usr/share/man/man3/getspnam.3* \ + "$pkgdir"/usr/share/man/man5/passwd.5* || return 1 } md5sums="2bfafe7d4962682d31b5eba65dba4fc8 shadow-4.2.1.tar.xz -- cgit v1.2.3