From patchwork Mon Mar 13 20:11:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 9622045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3684D604CC for ; Mon, 13 Mar 2017 20:11:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A5F72850E for ; Mon, 13 Mar 2017 20:11:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BCD5281B7; Mon, 13 Mar 2017 20:11:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DF0B281B7 for ; Mon, 13 Mar 2017 20:11:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751874AbdCMULV (ORCPT ); Mon, 13 Mar 2017 16:11:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35518 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753474AbdCMULT (ORCPT ); Mon, 13 Mar 2017 16:11:19 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41D3E79DE3; Mon, 13 Mar 2017 20:11:19 +0000 (UTC) Received: from [172.31.27.133] (dhcp-17-185.bos.redhat.com [10.18.17.185]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2DKBH7V014045; Mon, 13 Mar 2017 16:11:18 -0400 Subject: Re: [PATCH rdma_core] redhat spec: Avoid conflict due to implicit directory add To: Jason Gunthorpe , Knut Omang References: <9707bd97229b67fe04d29affcb37f61b80e20dca.1484143751.git-series.knut.omang@oracle.com> <20170313170829.GD25664@obsidianresearch.com> Cc: Doug Ledford , linux-rdma@vger.kernel.org From: Jarod Wilson Message-ID: <6e210956-a4e0-242f-a24e-691f87de3ddb@redhat.com> Date: Mon, 13 Mar 2017 16:11:18 -0400 User-Agent: Mutt/1.5.21 (2010-09-15) MIME-Version: 1.0 In-Reply-To: <20170313170829.GD25664@obsidianresearch.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 13 Mar 2017 20:11:19 +0000 (UTC) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 2017-03-13 1:08 PM, Jason Gunthorpe wrote: > On Wed, Jan 11, 2017 at 03:19:34PM +0100, Knut Omang wrote: >> If *-notation is used to include subdirectories, they >> seem to end as explicit file additions. This causes conflicts >> with other packages that provides the same >> directories, in this case rdma_core-devel conflicts >> with filesystem and kernel-headers. >> >> Using %dir did not seem to help >> avoiding the issue but rather cause duplicate warnings, eg. >> >> warning: File listed twice: /usr/include/infiniband >> >> This should be considered a bug in rpmbuild but >> probably needs to be fixed here anyway: >> >> List each individual directory with wildcards >> to avoid the issue. >> >> Signed-off-by: Knut Omang >> redhat/rdma-core.spec | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) > > Did this ever get settled? > > Jarod? Yes/No? Actually, looking a little closer, I think this is more apropos: diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index f3c1c296..383cb965 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -347,7 +347,10 @@ rm -rf %{buildroot}/%{_initrddir}/ %files devel %doc %{_docdir}/%{name}-%{version}/MAINTAINERS -%{_includedir}/* +%dir %{_includedir}/infiniband +%dir %{_includedir}/rdma +%{_includedir}/infiniband/* +%{_includedir}/rdma/* %{_libdir}/lib*.so %{_mandir}/man3/ibv_* %{_mandir}/man3/rdma*