<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/18295">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</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: I38f80d0f867a2bbaa09b5a42cad5028f23a8effa<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-hlr.spec.in<br>3 files changed, 11 insertions(+), 7 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 0965935..3d9c81b 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -67,3 +67,5 @@</span><br><span> doc/manuals/osmomsc-usermanual.xml</span><br><span> doc/manuals/common</span><br><span> doc/manuals/build</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+contrib/osmo-hlr.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 0e03ff0..4ed6978 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -200,6 +200,7 @@</span><br><span> contrib/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span> contrib/dgsm/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/osmo-hlr.spec</span><br><span> tests/Makefile</span><br><span> tests/auc/Makefile</span><br><span> tests/auc/gen_ts_55_205_test_sets/Makefile</span><br><span>diff --git a/contrib/osmo-hlr.spec b/contrib/osmo-hlr.spec.in</span><br><span>similarity index 96%</span><br><span>rename from contrib/osmo-hlr.spec</span><br><span>rename to contrib/osmo-hlr.spec.in</span><br><span>index 3b5a9fa..bd1b278 100644</span><br><span>--- a/contrib/osmo-hlr.spec</span><br><span>+++ b/contrib/osmo-hlr.spec.in</span><br><span>@@ -13,24 +13,22 @@</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-hlr</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 1.2.0.48</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: Osmocom Home Location Register for GSUP protocol towards OsmoSGSN and OsmoCSCN</span><br><span> License: AGPL-3.0-or-later AND GPL-2.0-or-later</span><br><span> Group: Productivity/Telephony/Servers</span><br><span style="color: hsl(0, 100%, 40%);">-URL: https://projects.osmocom.org/projects/osmo-hlr</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/osmo-hlr</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span> BuildRequires: autoconf</span><br><span> BuildRequires: automake</span><br><span> BuildRequires: libtool</span><br><span> BuildRequires: pkgconfig >= 0.20</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: python2</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: python3</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> BuildRequires: systemd-rpm-macros</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> BuildRequires: pkgconfig(libosmoabis) >= 0.6.0</span><br><span> BuildRequires: pkgconfig(libosmocore) >= 1.2.0</span><br><span> BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0</span><br><span>@@ -40,6 +38,7 @@</span><br><span> BuildRequires: pkgconfig(talloc) >= 2.0.1</span><br><span> # only needed for populate_hlr_db.pl</span><br><span> Requires: libdbi-drivers-dbd-sqlite3</span><br><span style="color: hsl(120, 100%, 40%);">+%{?systemd_requires}</span><br><span> </span><br><span> %description</span><br><span> The GSUP HLR is a stand-alone HLR (Home Location Register) for SIM</span><br><span>@@ -128,6 +127,7 @@</span><br><span> %check</span><br><span> make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> %preun</span><br><span> %service_del_preun %{name}.service</span><br><span> </span><br><span>@@ -139,6 +139,7 @@</span><br><span> </span><br><span> %post</span><br><span> %service_add_post %{name}.service</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %post -n libosmo-gsup-client0 -p /sbin/ldconfig</span><br><span> %postun -n libosmo-gsup-client0 -p /sbin/ldconfig</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/18295">change 18295</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-hlr/+/18295"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I38f80d0f867a2bbaa09b5a42cad5028f23a8effa </div>
<div style="display:none"> Gerrit-Change-Number: 18295 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>