Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 256AE781220 for <~alpine/aports@lists.alpinelinux.org>; Mon, 23 May 2022 23:58:49 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpwn.com; s=key1; t=1653350022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZWbRYczhN70tHnKXszVErjfuDPBxAFodN6dz3UQEH9w=; b=PS3cpoWIMZf4bcVH/kZVxY1BewsKP/CIZzFmVLpBorDYBndX6kX9ZFKn4d43A/FdSGMuG6 fVRhm9lQdZnrVMW4AJJt1J+XZT0TMRlqLtqXxboOK5E3AZosKvEb4x19vwmSafhG3M4V8M 5h+rvn79HXWnPvCkFSk6TGW6skjqU0kNMhsqxKnkHqjTERbJivgHKt2g6OVI1TFCcfyfpb m9wloN67HXYWRHFAW6hrB6ntkuFSSUzjoDTA8y2vJYl5Qg5yE8RfCaZdMya/5gdJ++rTXV TjKTyGsmaoSM8Plu3TWldku6T9nX4SVykhdbCfKfn77/evm1Y8vbxanOQDPDww== From: Drew DeVault To: ~alpine/aports@lists.alpinelinux.org Cc: Drew DeVault Subject: [PATCH] main/gdb: correct conflict with binutils Date: Tue, 24 May 2022 01:53:38 +0200 Message-Id: <20220523235338.12804-1-sir@cmpwn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: cmpwn.com --- main/gdb/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD index 4dfaf98535..7f66831435 100644 --- a/main/gdb/APKBUILD +++ b/main/gdb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=gdb pkgver=12.1 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Debugger" url="https://www.gnu.org/software/gdb/" arch="all" @@ -69,6 +69,7 @@ package() { # resolve conflict with binutils-doc rm -f "$pkgdir"/usr/share/info/bfd.info + rm -f "$pkgdir"/usr/share/info/ctf-spec.info rm -f "$pkgdir"/usr/share/info/dir # those are provided by binutils base-commit: b85778f73f80ad45ffcbcf9040f7729e330efce3 -- 2.36.1