<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25952">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/osmo-iuh.spec.in: fix header packaging<br><br>Fix the conflict from having %{_includedir}/* in multiple packages by<br>replacing it with the correct subdir path.<br><br>Fix for:<br>  found conflict of libosmo-hnbap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl with libosmo-ranap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl:<br>    - /usr/include/osmocom/hnbap/Access-stratum-release-indicator.h<br>    - /usr/include/osmocom/hnbap/AccessResult.h<br>    - /usr/include/osmocom/hnbap/AdditionalNeighbourInfoList.h<br>  ...<br><br>I've verified that it builds again in my own OBS namespace.<br><br>Related: SYS#5516<br>Fixes: 35f2bd ("Provide libosmo-hnbap as a public shared library")<br>Fixes: dba8b0 ("Provide libosmo-rua as a public shared library")<br>Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc<br>---<br>M contrib/osmo-iuh.spec.in<br>1 file changed, 13 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in</span><br><span>index 2ef38a3..b4f14f2 100644</span><br><span>--- a/contrib/osmo-iuh.spec.in</span><br><span>+++ b/contrib/osmo-iuh.spec.in</span><br><span>@@ -2,6 +2,7 @@</span><br><span> # spec file for package osmo-iuh</span><br><span> #</span><br><span> # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (c) 2021 sysmocom - s.f.m.c GmbH</span><br><span> #</span><br><span> # All modifications and additions to the file contributed by third parties</span><br><span> # remain the property of their copyright owners, unless otherwise agreed</span><br><span>@@ -154,7 +155,9 @@</span><br><span> %{_libdir}/libosmo-hnbap.so.0*</span><br><span> </span><br><span> %files -n libosmo-hnbap-devel</span><br><span style="color: hsl(0, 100%, 40%);">-%{_includedir}/*</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/hnbap/</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/osmocom/hnbap/*</span><br><span> %{_libdir}/libosmo-hnbap.so</span><br><span> %{_libdir}/pkgconfig/libosmo-hnbap.pc</span><br><span> </span><br><span>@@ -162,7 +165,9 @@</span><br><span> %{_libdir}/libosmo-ranap.so.3*</span><br><span> </span><br><span> %files -n libosmo-ranap-devel</span><br><span style="color: hsl(0, 100%, 40%);">-%{_includedir}/*</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/ranap/</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/osmocom/ranap/*</span><br><span> %{_libdir}/libosmo-ranap.so</span><br><span> %{_libdir}/pkgconfig/libosmo-ranap.pc</span><br><span> </span><br><span>@@ -170,7 +175,9 @@</span><br><span> %{_libdir}/libosmo-rua.so.0*</span><br><span> </span><br><span> %files -n libosmo-rua-devel</span><br><span style="color: hsl(0, 100%, 40%);">-%{_includedir}/*</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/rua/</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/osmocom/rua/*</span><br><span> %{_libdir}/libosmo-rua.so</span><br><span> %{_libdir}/pkgconfig/libosmo-rua.pc</span><br><span> </span><br><span>@@ -178,6 +185,9 @@</span><br><span> %{_libdir}/libosmo-sabp.so.0*</span><br><span> </span><br><span> %files -n libosmo-sabp-devel</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_includedir}/osmocom/sabp/</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/osmocom/sabp/*</span><br><span> %{_libdir}/libosmo-sabp.so</span><br><span> %{_libdir}/pkgconfig/libosmo-sabp.pc</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25952">change 25952</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-iuh/+/25952"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc </div>
<div style="display:none"> Gerrit-Change-Number: 25952 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>