<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/18301">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: If5499e11d872e629a018fc77d5adf5d0cb863d48<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-msc.spec.in<br>3 files changed, 10 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 bcd6847..ece4ee7 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -72,3 +72,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-msc.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 984c627..1e0740e 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -267,4 +267,5 @@</span><br><span> doc/sequence_charts/Makefile</span><br><span> contrib/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/osmo-msc.spec</span><br><span> Makefile)</span><br><span>diff --git a/contrib/osmo-msc.spec b/contrib/osmo-msc.spec.in</span><br><span>similarity index 94%</span><br><span>rename from contrib/osmo-msc.spec</span><br><span>rename to contrib/osmo-msc.spec.in</span><br><span>index 55fa4f9..1ebe9fa 100644</span><br><span>--- a/contrib/osmo-msc.spec</span><br><span>+++ b/contrib/osmo-msc.spec.in</span><br><span>@@ -12,27 +12,26 @@</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> ## Disable LTO for now since it breaks compilation of the tests</span><br><span> ## https://osmocom.org/issues/4115</span><br><span> %define _lto_cflags %{nil}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> %define with_iu 1</span><br><span> Name: osmo-msc</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 1.6.1.32</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: Osmocom's MSC for 2G and 3G circuit-switched mobile networks</span><br><span> License: AGPL-3.0-or-later AND GPL-2.0-only</span><br><span> Group: Productivity/Telephony/Servers</span><br><span style="color: hsl(0, 100%, 40%);">-URL: https://osmocom.org/projects/osmomsc/wiki</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/osmomsc</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span> BuildRequires: autoconf</span><br><span> BuildRequires: automake</span><br><span> BuildRequires: libdbi-drivers-dbd-sqlite3</span><br><span> BuildRequires: libtool</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 >= 0.20</span><br><span> BuildRequires: pkgconfig(dbi)</span><br><span> BuildRequires: pkgconfig(libcrypto) >= 0.9.5</span><br><span>@@ -86,6 +85,7 @@</span><br><span> %install</span><br><span> %make_install</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>@@ -97,6 +97,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> %check</span><br><span> make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/18301">change 18301</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-msc/+/18301"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If5499e11d872e629a018fc77d5adf5d0cb863d48 </div>
<div style="display:none"> Gerrit-Change-Number: 18301 </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>