<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/18303">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: I7ac5f2c6bf11d88a3ebbc2f17d963d26f0b7de13<br>---<br>M .gitignore<br>M configure.ac<br>R contrib/osmo-pcap.spec.in<br>3 files changed, 10 insertions(+), 4 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 882ef61..dd48c7d 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -35,3 +35,5 @@</span><br><span> tests/package.m4</span><br><span> tests/testsuite</span><br><span> tests/testsuite.log</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+contrib/osmo-pcap.spec</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 2511b37..111d477 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -145,6 +145,7 @@</span><br><span> src/Makefile</span><br><span> contrib/Makefile</span><br><span> contrib/systemd/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/osmo-pcap.spec</span><br><span> doc/Makefile</span><br><span> doc/examples/Makefile</span><br><span> tests/Makefile</span><br><span>diff --git a/contrib/osmo-pcap.spec b/contrib/osmo-pcap.spec.in</span><br><span>similarity index 94%</span><br><span>rename from contrib/osmo-pcap.spec</span><br><span>rename to contrib/osmo-pcap.spec.in</span><br><span>index 9cbafbe..2755afa 100644</span><br><span>--- a/contrib/osmo-pcap.spec</span><br><span>+++ b/contrib/osmo-pcap.spec.in</span><br><span>@@ -12,11 +12,8 @@</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> Name: osmo-pcap</span><br><span style="color: hsl(0, 100%, 40%);">-Version: 0.1.2.0</span><br><span style="color: hsl(120, 100%, 40%);">+Version: @VERSION@</span><br><span> Release: 0</span><br><span> Summary: Osmocom's PCAP client and server</span><br><span> License: AGPL-3.0-or-later AND GPL-2.0-or-later</span><br><span>@@ -27,6 +24,9 @@</span><br><span> BuildRequires: automake >= 1.6</span><br><span> BuildRequires: libpcap-devel</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</span><br><span> BuildRequires: pkgconfig(gnutls)</span><br><span> BuildRequires: pkgconfig(libosmocore) >= 0.11.0</span><br><span>@@ -34,6 +34,7 @@</span><br><span> BuildRequires: pkgconfig(libosmogsm) >= 0.11.0</span><br><span> BuildRequires: pkgconfig(libosmovty) >= 0.11.0</span><br><span> BuildRequires: pkgconfig(libzmq) >= 3.2.2</span><br><span style="color: hsl(120, 100%, 40%);">+%{?systemd_requires}</span><br><span> </span><br><span> %description</span><br><span> Osmocom tools to help with pcap tracing.</span><br><span>@@ -53,6 +54,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 osmo-pcap-client.service osmo-pcap-server.service</span><br><span> </span><br><span>@@ -64,6 +66,7 @@</span><br><span> </span><br><span> %post</span><br><span> %service_add_post osmo-pcap-client.service osmo-pcap-server.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-pcap/+/18303">change 18303</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-pcap/+/18303"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7ac5f2c6bf11d88a3ebbc2f17d963d26f0b7de13 </div>
<div style="display:none"> Gerrit-Change-Number: 18303 </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-MessageType: merged </div>