<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/18313">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>Disable lms, usrp1 for CentOS 8.<br><br>Related: OS#4550<br>Change-Id: Ie27fcc4f9033f0049507d9dcc295541ac0744c73<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-trx.spec.in<br>3 files changed, 32 insertions(+), 9 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 f163fb6..128f803 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -63,3 +63,6 @@</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-trx.spec</span><br><span style="color: hsl(120, 100%, 40%);">+!contrib/osmo-trx.spec.in</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index d0cfe44..07d4bf4 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -336,4 +336,5 @@</span><br><span> ])</span><br><span> </span><br><span> AC_OUTPUT(</span><br><span style="color: hsl(0, 100%, 40%);">- doc/manuals/Makefile)</span><br><span style="color: hsl(120, 100%, 40%);">+ doc/manuals/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/osmo-trx.spec)</span><br><span>diff --git a/contrib/osmo-trx.spec b/contrib/osmo-trx.spec.in</span><br><span>similarity index 92%</span><br><span>rename from contrib/osmo-trx.spec</span><br><span>rename to contrib/osmo-trx.spec.in</span><br><span>index 2e5989d..535e375 100644</span><br><span>--- a/contrib/osmo-trx.spec</span><br><span>+++ b/contrib/osmo-trx.spec.in</span><br><span>@@ -12,33 +12,34 @@</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-trx</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 1.2.0.33</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: SDR transceiver that implements Layer 1 of a GSM BTS</span><br><span> License: AGPL-3.0-or-later</span><br><span> Group: Productivity/Telephony/Servers</span><br><span style="color: hsl(0, 100%, 40%);">-URL: https://osmocom.org/projects/osmotrx/wiki/OsmoTRX</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/osmotrx</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span style="color: hsl(0, 100%, 40%);">-Source99: osmo-trx-rpmlintrc</span><br><span> BuildRequires: autoconf</span><br><span> BuildRequires: automake</span><br><span> BuildRequires: fdupes</span><br><span> BuildRequires: gcc-c++</span><br><span> BuildRequires: libtool</span><br><span> BuildRequires: pkgconfig >= 0.20</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 style="color: hsl(120, 100%, 40%);">+%if ! 0%{?centos_ver}</span><br><span> BuildRequires: pkgconfig(LimeSuite)</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: pkgconfig(usrp) >= 3.3</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> BuildRequires: pkgconfig(fftw3f)</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: pkgconfig(libosmocoding) >= 1.3.0</span><br><span> BuildRequires: pkgconfig(libosmocore) >= 0.12.0</span><br><span> BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0</span><br><span> BuildRequires: pkgconfig(libosmovty) >= 0.12.0</span><br><span> BuildRequires: pkgconfig(libusb-1.0)</span><br><span> BuildRequires: pkgconfig(uhd)</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: pkgconfig(usrp) >= 3.3</span><br><span> %{?systemd_requires}</span><br><span> %if 0%{?suse_version} > 1325</span><br><span> BuildRequires: libboost_program_options-devel</span><br><span>@@ -85,6 +86,7 @@</span><br><span> between different telecommunication associations for developing new</span><br><span> generations of mobile phone networks. (post-2G/GSM)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%if ! 0%{?centos_ver}</span><br><span> %package usrp1</span><br><span> Summary: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)</span><br><span> Group: Productivity/Telephony/Servers</span><br><span>@@ -124,6 +126,7 @@</span><br><span> 3GPP is the "3rd Generation Partnership Project" which is the collaboration</span><br><span> between different telecommunication associations for developing new</span><br><span> generations of mobile phone networks. (post-2G/GSM)</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %prep</span><br><span> %setup -q</span><br><span>@@ -131,12 +134,22 @@</span><br><span> %build</span><br><span> echo "%{version}" >.tarball-version</span><br><span> autoreconf -fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?centos_ver}</span><br><span style="color: hsl(120, 100%, 40%);">+%configure \</span><br><span style="color: hsl(120, 100%, 40%);">+ --docdir=%{_docdir}/%{name} \</span><br><span style="color: hsl(120, 100%, 40%);">+ --with-systemdsystemunitdir=%{_unitdir} \</span><br><span style="color: hsl(120, 100%, 40%);">+ --without-lms \</span><br><span style="color: hsl(120, 100%, 40%);">+ --with-uhd \</span><br><span style="color: hsl(120, 100%, 40%);">+ --without-usrp1</span><br><span style="color: hsl(120, 100%, 40%);">+%else</span><br><span> %configure \</span><br><span> --docdir=%{_docdir}/%{name} \</span><br><span> --with-systemdsystemunitdir=%{_unitdir} \</span><br><span> --with-lms \</span><br><span> --with-uhd \</span><br><span> --with-usrp1</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> make %{?_smp_mflags} V=1</span><br><span> </span><br><span>@@ -147,6 +160,7 @@</span><br><span> %make_install</span><br><span> %fdupes -s %{buildroot}/%{_datadir}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> %pre lms %service_add_pre osmo-trx-lms.service</span><br><span> %post lms %service_add_post osmo-trx-lms.service</span><br><span> %preun lms %service_del_preun osmo-trx-lms.service</span><br><span>@@ -159,17 +173,20 @@</span><br><span> %post usrp1 %service_add_post osmo-trx-usrp1.service</span><br><span> %preun usrp1 %service_del_preun osmo-trx-usrp1.service</span><br><span> %postun usrp1 %service_del_postun osmo-trx-usrp1.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> %doc README.md</span><br><span> %doc %{_docdir}/%{name}/examples</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%if ! 0%{?centos_ver}</span><br><span> %files lms</span><br><span> %{_bindir}/osmo-trx-lms</span><br><span> %dir %{_sysconfdir}/osmocom</span><br><span> %config %{_sysconfdir}/osmocom/osmo-trx-lms.cfg</span><br><span> %{_unitdir}/osmo-trx-lms.service</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %files uhd</span><br><span> %{_bindir}/osmo-trx-uhd</span><br><span>@@ -177,6 +194,7 @@</span><br><span> %config %{_sysconfdir}/osmocom/osmo-trx-uhd.cfg</span><br><span> %{_unitdir}/osmo-trx-uhd.service</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%if ! 0%{?centos_ver}</span><br><span> %files usrp1</span><br><span> %{_bindir}/osmo-trx-usrp1</span><br><span> %dir %{_datadir}/usrp</span><br><span>@@ -185,5 +203,6 @@</span><br><span> %{_datadir}/usrp/rev2/std_inband.rbf</span><br><span> %{_datadir}/usrp/rev4/std_inband.rbf</span><br><span> %{_unitdir}/osmo-trx-usrp1.service</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %changelog</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/18313">change 18313</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-trx/+/18313"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie27fcc4f9033f0049507d9dcc295541ac0744c73 </div>
<div style="display:none"> Gerrit-Change-Number: 18313 </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-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>