<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libusrp/+/18375">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;">Makefile.common: LTVERSIONFLAGS: remove -release<br><br>Generate the soname from LIBVERSION (initially 1:0:0), instead of VERSION.<br>This means, we have binary compatibility between each major release<br>(which we should increase if we ever have a breaking change), instead of<br>forcing a binary incompatibility for each packaged version (also nightly<br>packages). This is how we do it in other Osmocom projects, too.<br><br>Fix nightly RPM packaging, as we now don't need to add the git commit to<br>the package name:<br><br>[  135s] libusrp.i586: E: shlib-policy-name-error (Badness: 10000) libusrp-3_4_4_4_c46f0<br>[  135s] Your package contains a single shared library but is not named after its<br>[  135s] SONAME.<br><br>The debian package is already using libusrp1 as package name.<br><br>Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release<br>Change-Id: I73b222ea7e2fd0117827f9d6f28b23671068533b<br>---<br>M Makefile.common<br>M contrib/libusrp.spec.in<br>2 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.common b/Makefile.common</span><br><span>index 1892fd3..fed7c78 100644</span><br><span>--- a/Makefile.common</span><br><span>+++ b/Makefile.common</span><br><span>@@ -36,8 +36,13 @@</span><br><span> #AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@</span><br><span> #AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# This is _NOT_ the library release version, it's an API version.</span><br><span style="color: hsl(120, 100%, 40%);">+# Please read chapter "Library interface versions" of the libtool documentation</span><br><span style="color: hsl(120, 100%, 40%);">+# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html</span><br><span style="color: hsl(120, 100%, 40%);">+LIBVERSION=1:0:0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Sets ABI version in SONAME and appends -LIBVER to filename</span><br><span style="color: hsl(0, 100%, 40%);">-LTVERSIONFLAGS = -version-info 0:0:0 -release $(VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+LTVERSIONFLAGS = -version-info $(LIBVERSION)</span><br><span> </span><br><span> # includes</span><br><span> grincludedir = $(includedir)/gnuradio</span><br><span>diff --git a/contrib/libusrp.spec.in b/contrib/libusrp.spec.in</span><br><span>index 65fa92b..75ceeaa 100644</span><br><span>--- a/contrib/libusrp.spec.in</span><br><span>+++ b/contrib/libusrp.spec.in</span><br><span>@@ -13,8 +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(0, 100%, 40%);">-%define sover   -3_4_4+git_20190808-0</span><br><span style="color: hsl(0, 100%, 40%);">-%define libname libusrp%{sover}</span><br><span style="color: hsl(120, 100%, 40%);">+%define libname libusrp1</span><br><span> Name:           libusrp</span><br><span> Version:        @VERSION@</span><br><span> Release:        0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libusrp/+/18375">change 18375</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/libusrp/+/18375"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libusrp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I73b222ea7e2fd0117827f9d6f28b23671068533b </div>
<div style="display:none"> Gerrit-Change-Number: 18375 </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-Reviewer: roox <mardnh@gmx.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>