<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/18297">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib: integrate RPM spec<br><br>Remove OpenSUSE bug report link, set version to @VERSION@, make it build<br>with CentOS 8 etc.<br><br>Related: OS#4550<br>Change-Id: Ibec1a22952ecfb0578bb4611e65ad819f5984fd8<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-iuh.spec.in<br>3 files changed, 12 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index e32000c..7041f69 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -49,3 +49,5 @@</span><br><span> doc/manuals/common</span><br><span> doc/manuals/generated</span><br><span> doc/manuals/*.pdf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+contrib/osmo-iuh.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 1875d5e..692db57 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -167,4 +167,5 @@</span><br><span> doc/manuals/Makefile</span><br><span> contrib/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/osmo-iuh.spec</span><br><span> )</span><br><span>diff --git a/contrib/osmo-iuh.spec b/contrib/osmo-iuh.spec.in</span><br><span>similarity index 94%</span><br><span>rename from contrib/osmo-iuh.spec</span><br><span>rename to contrib/osmo-iuh.spec.in</span><br><span>index e2abd35..82046fe 100644</span><br><span>--- a/contrib/osmo-iuh.spec</span><br><span>+++ b/contrib/osmo-iuh.spec.in</span><br><span>@@ -12,17 +12,13 @@</span><br><span> # license that conforms to the Open Source Definition (Version 1.9)</span><br><span> # published by the Open Source Initiative.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Please submit bugfixes or comments via http://bugs.opensuse.org/</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> Name: osmo-iuh</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 0.6.0.13</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span> License: AGPL-3.0-or-later AND GPL-2.0-or-later</span><br><span> Group: Hardware/Mobile</span><br><span style="color: hsl(0, 100%, 40%);">-URL: https://osmocom.org/projects/osmohnbgw/wiki</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/osmohnbgw</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span> BuildRequires: automake >= 1.9</span><br><span> BuildRequires: libtool >= 2</span><br><span>@@ -30,6 +26,9 @@</span><br><span> BuildRequires: pkgconfig >= 0.20</span><br><span> # python3 for asn1tostruct.py</span><br><span> BuildRequires: python3</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: systemd-rpm-macros</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> BuildRequires: pkgconfig(libasn1c) >= 0.9.30</span><br><span> BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0</span><br><span> BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0</span><br><span>@@ -38,6 +37,7 @@</span><br><span> BuildRequires: pkgconfig(libosmogb)</span><br><span> BuildRequires: pkgconfig(libosmogsm) >= 0.12.0</span><br><span> BuildRequires: pkgconfig(libosmovty) >= 0.12.0</span><br><span style="color: hsl(120, 100%, 40%);">+%{?systemd_requires}</span><br><span> </span><br><span> %description</span><br><span> Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)</span><br><span>@@ -103,10 +103,13 @@</span><br><span> %postun -n libosmo-ranap3 -p /sbin/ldconfig</span><br><span> %post -n libosmo-sabp0 -p /sbin/ldconfig</span><br><span> %postun -n libosmo-sabp0 -p /sbin/ldconfig</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> %pre %service_add_pre osmo-hnbgw.service</span><br><span> %post %service_add_post osmo-hnbgw.service</span><br><span> %preun %service_del_preun osmo-hnbgw.service</span><br><span> %postun %service_del_postun osmo-hnbgw.service</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %files</span><br><span> %license COPYING</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/18297">change 18297</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/+/18297"/><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: Ibec1a22952ecfb0578bb4611e65ad819f5984fd8 </div>
<div style="display:none"> Gerrit-Change-Number: 18297 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>