X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 7B93BDC00B8 for ; Thu, 13 Aug 2015 11:02:43 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id B01C0DC0084; Thu, 13 Aug 2015 11:02:42 +0000 (UTC) Received: from localhost (ip5f5ac946.dynamic.kabel-deutschland.de [95.90.201.70]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id c1e6a699; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Thu, 13 Aug 2015 13:02:41 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/man-pages: don't conflict with mdocml Date: Thu, 13 Aug 2015 13:02:32 +0200 Message-Id: <1439463752-3393-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.5.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/man-pages/APKBUILD | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 3004d68..c727e11 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -2,12 +2,12 @@ pkgname=man-pages pkgver=4.02 _posixver=2003-a -pkgrel=2 +pkgrel=3 pkgdesc="Linux man pages" url="http://www.kernel.org/doc/man-pages/" arch="noarch" license="GPL" -depends= +depends="" makedepends="" options="!strip" source="http://www.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz @@ -43,9 +43,13 @@ package() { make prefix="$pkgdir"/usr install || return 1 # provided by libiconv-doc - rm "$pkgdir"/usr/share/man/man3/iconv* + rm -f "$pkgdir"/usr/share/man/man3/iconv* + # provided by mdocml + rm -f "$pkgdir"/usr/share/man/man7/man* \ + "$pkgdir"/usr/share/man/man7/mdoc* } + md5sums="6c5692af39eb5fe468a8bd1f110b0edd man-pages-4.02.tar.xz 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 a1c5e5e809d366b0a94b311f3baaf2b5 mktemp-invalid-argument.patch" -- 2.5.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---