<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18290">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 with<br>CentOS 8 etc.<br><br>Related: OS#4550<br>Change-Id: I4b87cb0d80bda7bbfda600310aee24a814f97f3f<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-bsc.spec.in<br>3 files changed, 9 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 ea828b6..c7b14bf 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -83,3 +83,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-bsc.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 06a00fe..d96dfb2 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -254,4 +254,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-bsc.spec</span><br><span> Makefile)</span><br><span>diff --git a/contrib/osmo-bsc.spec b/contrib/osmo-bsc.spec.in</span><br><span>similarity index 95%</span><br><span>rename from contrib/osmo-bsc.spec</span><br><span>rename to contrib/osmo-bsc.spec.in</span><br><span>index 1aa4baf..20367a0 100644</span><br><span>--- a/contrib/osmo-bsc.spec</span><br><span>+++ b/contrib/osmo-bsc.spec.in</span><br><span>@@ -12,26 +12,24 @@</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/4113</span><br><span> %define _lto_cflags %{nil}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> Name: osmo-bsc</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 1.6.0.78</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks</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/openbsc/wiki/Osmo-bsc</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/osmobsc</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span> BuildRequires: automake >= 1.9</span><br><span> BuildRequires: libtool >= 2</span><br><span> BuildRequires: pkgconfig >= 0.20</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(libcrypto) >= 0.9.5</span><br><span> BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.5.0</span><br><span> BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0</span><br><span>@@ -100,6 +98,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>@@ -111,6 +110,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-bsc/+/18290">change 18290</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-bsc/+/18290"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4b87cb0d80bda7bbfda600310aee24a814f97f3f </div>
<div style="display:none"> Gerrit-Change-Number: 18290 </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>