[PATCH rdma_core] redhat spec: Avoid conflict due to implicit directory add

Knut Omang
2017-01-11T14:19:34Z

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 <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
---
redhat/rdma-core.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

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*

base-commit: b1c9b6aa22fb91507fb1a63df99566da7720315f
--
git-series 0.8.10