<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/26501">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">host/contrib/simtrace2.spec.in: update<br><br>Apply various improvements from Martin Hauke, thanks!<br><br>* Put sover into a variable<br>* Sync BuildRequires with configure.ac<br>* Update libosmo-simtrace2 summary<br>* Use %make_build instead of make %{?_smp_mflags}<br><br>Change-Id: I35ce3865702f72365b38b0eaa8b28f332dabcd1f<br>---<br>M host/contrib/simtrace2.spec.in<br>1 file changed, 16 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/contrib/simtrace2.spec.in b/host/contrib/simtrace2.spec.in</span><br><span>index 1c47f5e..0bc5d2a 100644</span><br><span>--- a/host/contrib/simtrace2.spec.in</span><br><span>+++ b/host/contrib/simtrace2.spec.in</span><br><span>@@ -1,7 +1,8 @@</span><br><span> #</span><br><span> # spec file for package simtrace2</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# Copyright (c) 2018, Martin Hauke <mardnh@gmx.de></span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (c) 2021 SUSE LLC</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (c) 2018-2021, Martin Hauke <mardnh@gmx.de></span><br><span> #</span><br><span> # All modifications and additions to the file contributed by third parties</span><br><span> # remain the property of their copyright owners, unless otherwise agreed</span><br><span>@@ -12,6 +13,7 @@</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(120, 100%, 40%);">+%define sover 1</span><br><span> Name: simtrace2</span><br><span> Version: @VERSION@</span><br><span> Release: 0</span><br><span>@@ -24,12 +26,11 @@</span><br><span> BuildRequires: automake</span><br><span> BuildRequires: libtool</span><br><span> BuildRequires: pkgconfig</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: pkgconfig(libosmocore)</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: pkgconfig(libosmosim)</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: pkgconfig(libosmocore) >= 1.4.0</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: pkgconfig(libosmosim) >= 1.4.0</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: pkgconfig(libosmousb) >= 1.4.0</span><br><span> BuildRequires: pkgconfig(libpcsclite)</span><br><span> BuildRequires: pkgconfig(libusb-1.0)</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: pkgconfig(libosmousb) >= 0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: pkgconfig(udev)</span><br><span> </span><br><span> %description</span><br><span> Osmocom SIMtrace 2 is a software and hardware system for passively</span><br><span>@@ -38,11 +39,11 @@</span><br><span> </span><br><span> This package contains SIMtrace 2 host utility.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%package -n libosmo-simtrace2-1</span><br><span style="color: hsl(0, 100%, 40%);">-Summary: Shared Library part of libosmo-simtrace2</span><br><span style="color: hsl(120, 100%, 40%);">+%package -n libosmo-simtrace2-%{sover}</span><br><span style="color: hsl(120, 100%, 40%);">+Summary: Driver functions for Osmocom SIMtrace2 and compatible firmware</span><br><span> Group: System/Libraries</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%description -n libosmo-simtrace2-1</span><br><span style="color: hsl(120, 100%, 40%);">+%description -n libosmo-simtrace2-%{sover}</span><br><span> This library contains core "driver" functionality to interface with the</span><br><span> Osmocom SIMtrace2 (and compatible) USB device firmware. It enables</span><br><span> applications to implement SIM card / smart card tracing as well as</span><br><span>@@ -51,7 +52,7 @@</span><br><span> %package -n libosmo-simtrace2-devel</span><br><span> Summary: Development files for the Osmocom SIMtrace2 library</span><br><span> Group: Development/Libraries/C and C++</span><br><span style="color: hsl(0, 100%, 40%);">-Requires: libosmo-simtrace2-1 = %{version}</span><br><span style="color: hsl(120, 100%, 40%);">+Requires: libosmo-simtrace2-%{sover} = %{version}</span><br><span> </span><br><span> %description -n libosmo-simtrace2-devel</span><br><span> Osmocom SIMtrace2 (and compatible) USB device firmware. It enables</span><br><span>@@ -69,17 +70,18 @@</span><br><span> echo "%{version}" >.tarball-version</span><br><span> autoreconf -fiv</span><br><span> %configure --disable-static</span><br><span style="color: hsl(0, 100%, 40%);">-make %{?_smp_mflags}</span><br><span style="color: hsl(120, 100%, 40%);">+%make_build</span><br><span> </span><br><span> %install</span><br><span> %make_install -C host</span><br><span> install -Dm0644 host/contrib/99-simtrace2.rules %{buildroot}/%{_udevrulesdir}/99-simtrace2.rules</span><br><span> find %{buildroot} -type f -name "*.la" -delete -print</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%post -n libosmo-simtrace2-1 -p /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-%postun -n libosmo-simtrace2-1 -p /sbin/ldconfig</span><br><span style="color: hsl(120, 100%, 40%);">+%post -n libosmo-simtrace2-%{sover} -p /sbin/ldconfig</span><br><span style="color: hsl(120, 100%, 40%);">+%postun -n libosmo-simtrace2-%{sover} -p /sbin/ldconfig</span><br><span> </span><br><span> %files</span><br><span style="color: hsl(120, 100%, 40%);">+%license host/COPYING</span><br><span> %doc README.md</span><br><span> %{_bindir}/simtrace2-cardem-pcsc</span><br><span> %{_bindir}/simtrace2-list</span><br><span>@@ -87,8 +89,8 @@</span><br><span> %{_bindir}/simtrace2-tool</span><br><span> %{_udevrulesdir}/99-simtrace2.rules</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-%files -n libosmo-simtrace2-1</span><br><span style="color: hsl(0, 100%, 40%);">-%{_libdir}/libosmo-simtrace2.so.1*</span><br><span style="color: hsl(120, 100%, 40%);">+%files -n libosmo-simtrace2-%{sover}</span><br><span style="color: hsl(120, 100%, 40%);">+%{_libdir}/libosmo-simtrace2.so.%{sover}*</span><br><span> </span><br><span> %files -n libosmo-simtrace2-devel</span><br><span> %dir %{_includedir}/osmocom/</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/26501">change 26501</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/simtrace2/+/26501"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I35ce3865702f72365b38b0eaa8b28f332dabcd1f </div>
<div style="display:none"> Gerrit-Change-Number: 26501 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>