<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/18307">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: Ib2da03980d99f12ab36ca5d5fdde92ddbefb040b<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-remsim.spec.in<br>3 files changed, 17 insertions(+), 13 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 e2546a0..a1cec37 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -49,3 +49,5 @@</span><br><span> debian/.debhelper</span><br><span> debian/debhelper*</span><br><span> debian/files</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+contrib/osmo-remsim.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index b65340f..5833d0d 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -196,6 +196,7 @@</span><br><span> contrib/Makefile</span><br><span> contrib/etc_default/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/osmo-remsim.spec</span><br><span> doc/Makefile</span><br><span> doc/manuals/Makefile</span><br><span> src/Makefile</span><br><span>diff --git a/contrib/osmo-remsim.spec b/contrib/osmo-remsim.spec.in</span><br><span>similarity index 92%</span><br><span>rename from contrib/osmo-remsim.spec</span><br><span>rename to contrib/osmo-remsim.spec.in</span><br><span>index 84874bc..4ff26bc 100644</span><br><span>--- a/contrib/osmo-remsim.spec</span><br><span>+++ b/contrib/osmo-remsim.spec.in</span><br><span>@@ -12,24 +12,23 @@</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> %define sover 1</span><br><span> Name: osmo-remsim</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 0.2.2.86</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: Osmocom remote SIM software suite</span><br><span> License: 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-remsim</span><br><span style="color: hsl(120, 100%, 40%);">+URL: https://osmocom.org/projects/osmo-remsim</span><br><span> Source: %{name}-%{version}.tar.xz</span><br><span> BuildRequires: autoconf</span><br><span> BuildRequires: automake</span><br><span> BuildRequires: libcsv-devel</span><br><span> BuildRequires: libtool</span><br><span> BuildRequires: pkgconfig</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(libasn1c) >= 0.9.30</span><br><span> BuildRequires: pkgconfig(libosmoabis)</span><br><span> BuildRequires: pkgconfig(libosmocore) >= 0.11.0</span><br><span>@@ -40,7 +39,7 @@</span><br><span> BuildRequires: pkgconfig(libusb-1.0)</span><br><span> BuildRequires: pkgconfig(libosmousb)</span><br><span> BuildRequires: pkgconfig(libosmo-simtrace2)</span><br><span style="color: hsl(0, 100%, 40%);">-%{?systemd_ordering}</span><br><span style="color: hsl(120, 100%, 40%);">+%{?systemd_requires}</span><br><span> </span><br><span> %description</span><br><span> osmo-remsim is a suite of software programs enabling physical/geographic</span><br><span>@@ -159,6 +158,7 @@</span><br><span> %post -n libosmo-rspro%{sover} -p /sbin/ldconfig</span><br><span> %postun -n libosmo-rspro%{sover} -p /sbin/ldconfig</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?suse_version}</span><br><span> %pre -n osmo-remsim-bankd %service_add_pre osmo-remsim-bankd.service</span><br><span> %post -n osmo-remsim-bankd %service_add_post osmo-remsim-bankd.service</span><br><span> %preun -n osmo-remsim-bankd %service_del_preun osmo-remsim-bankd.service</span><br><span>@@ -173,6 +173,7 @@</span><br><span> %post -n osmo-remsim-server %service_add_post osmo-remsim-server.service</span><br><span> %preun -n osmo-remsim-server %service_del_preun osmo-remsim-server.service</span><br><span> %postun -n osmo-remsim-server %service_del_postun osmo-remsim-server.service</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> </span><br><span> %files -n libosmo-rspro%{sover}</span><br><span> %license COPYING</span><br><span>@@ -180,9 +181,8 @@</span><br><span> %{_libdir}/libosmo-rspro.so.%{sover}*</span><br><span> </span><br><span> %files -n libosmo-rspro-devel</span><br><span style="color: hsl(0, 100%, 40%);">-%{_includedir}/osmocom</span><br><span> %dir %{_includedir}/osmocom/rspro</span><br><span style="color: hsl(0, 100%, 40%);">-%{_includedir}/osmocom/rspro/rspro_client.h</span><br><span style="color: hsl(120, 100%, 40%);">+%{_includedir}/osmocom/rspro/*</span><br><span> %{_libdir}/libosmo-rspro.so</span><br><span> %{_libdir}/pkgconfig/libosmo-rspro.pc</span><br><span> </span><br><span>@@ -204,12 +204,13 @@</span><br><span> %config %{_sysconfdir}/default/osmo-remsim-client*</span><br><span> </span><br><span> %files -n libifd-osmo-remsim-client0</span><br><span style="color: hsl(0, 100%, 40%);">-%dir %{_libdir}/readers/</span><br><span style="color: hsl(120, 100%, 40%);">+%if 0%{?centos_ver}</span><br><span style="color: hsl(120, 100%, 40%);">+%dir %{_libdir}/pcsc/drivers/libifd-osmo-remsim-client.bundle</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/pcsc/drivers/libifd-osmo-remsim-client.bundle/*</span><br><span style="color: hsl(120, 100%, 40%);">+%else</span><br><span> %dir %{_libdir}/readers/libifd-osmo-remsim-client.bundle</span><br><span style="color: hsl(0, 100%, 40%);">-%dir %{_libdir}/readers/libifd-osmo-remsim-client.bundle/Contents</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/readers/libifd-osmo-remsim-client.bundle/Contents/PkgInfo</span><br><span style="color: hsl(0, 100%, 40%);">-%dir %{_libdir}/readers/libifd-osmo-remsim-client.bundle/Contents/Linux</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/readers/libifd-osmo-remsim-client.bundle/Contents/Linux/libifd_remsim_client.so*</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/readers/libifd-osmo-remsim-client.bundle/*</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span> %config %{_sysconfdir}/reader.conf.d/osmo-remsim-client-reader_conf</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-remsim/+/18307">change 18307</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-remsim/+/18307"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib2da03980d99f12ab36ca5d5fdde92ddbefb040b </div>
<div style="display:none"> Gerrit-Change-Number: 18307 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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-Reviewer: roox <mardnh@gmx.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>