| Message ID | 6e210956-a4e0-242f-a24e-691f87de3ddb@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, 2017-03-13 at 16:11 -0400, Jarod Wilson wrote: > 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 <knut.omang@oracle.com> > > > 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* Thanks, applied.
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*