From patchwork Wed Jan 11 14:19:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Knut Omang X-Patchwork-Id: 9510147 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 070B360231 for ; Wed, 11 Jan 2017 14:20:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAFCE28501 for ; Wed, 11 Jan 2017 14:20:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC38628649; Wed, 11 Jan 2017 14:20:13 +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, UNPARSEABLE_RELAY 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 5C39028501 for ; Wed, 11 Jan 2017 14:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755420AbdAKOUM (ORCPT ); Wed, 11 Jan 2017 09:20:12 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:48764 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751398AbdAKOUM (ORCPT ); Wed, 11 Jan 2017 09:20:12 -0500 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v0BEK29c029895 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Jan 2017 14:20:03 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v0BEK2Pu005777 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Jan 2017 14:20:02 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v0BEK122010865; Wed, 11 Jan 2017 14:20:01 GMT Received: from abi.no.oracle.com (/10.172.144.123) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 11 Jan 2017 06:20:01 -0800 From: Knut Omang To: Doug Ledford , Jason Gunthorpe Cc: linux-rdma@vger.kernel.org, Knut Omang Subject: [PATCH rdma_core] redhat spec: Avoid conflict due to implicit directory add Date: Wed, 11 Jan 2017 15:19:34 +0100 Message-Id: <9707bd97229b67fe04d29affcb37f61b80e20dca.1484143751.git-series.knut.omang@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: userv0021.oracle.com [156.151.31.71] 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 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(-) base-commit: b1c9b6aa22fb91507fb1a63df99566da7720315f diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index 4271e7c..72d6f3b 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -343,7 +343,8 @@ rm -rf %{buildroot}/%{_initrddir}/ %files devel %doc %{_docdir}/%{name}-%{version}/MAINTAINERS -%{_includedir}/* +%{_includedir}/infiniband/* +%{_includedir}/rdma/* %{_libdir}/lib*.so %{_mandir}/man3/ibv_* %{_mandir}/man3/rdma*