From 2d98f87ade333a9be0ff625f823cf08c9fbd23ea Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 20 May 2020 10:45:57 +0200 Subject: [PATCH] Makefile.common: LTVERSIONFLAGS: remove -release Generate the soname from LIBVERSION (initially 1:0:0), instead of VERSION. This means, we have binary compatibility between each major release (which we should increase if we ever have a breaking change), instead of forcing a binary incompatibility for each packaged version (also nightly packages). This is how we do it in other Osmocom projects, too. Fix nightly RPM packaging, as we now don't need to add the git commit to the package name: [ 135s] libusrp.i586: E: shlib-policy-name-error (Badness: 10000) libusrp-3_4_4_4_c46f0 [ 135s] Your package contains a single shared library but is not named after its [ 135s] SONAME. The debian package is already using libusrp1 as package name. Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release Change-Id: I73b222ea7e2fd0117827f9d6f28b23671068533b --- Makefile.common | 7 ++++++- contrib/libusrp.spec.in | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1892fd3..fed7c78 100644 --- a/Makefile.common +++ b/Makefile.common @@ -36,8 +36,13 @@ AUTOMAKE += -Wno-portability -Wnone #AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@ #AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@ +# This is _NOT_ the library release version, it's an API version. +# Please read chapter "Library interface versions" of the libtool documentation +# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +LIBVERSION=1:0:0 + # Sets ABI version in SONAME and appends -LIBVER to filename -LTVERSIONFLAGS = -version-info 0:0:0 -release $(VERSION) +LTVERSIONFLAGS = -version-info $(LIBVERSION) # includes grincludedir = $(includedir)/gnuradio diff --git a/contrib/libusrp.spec.in b/contrib/libusrp.spec.in index 65fa92b..75ceeaa 100644 --- a/contrib/libusrp.spec.in +++ b/contrib/libusrp.spec.in @@ -13,8 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -%define sover -3_4_4+git_20190808-0 -%define libname libusrp%{sover} +%define libname libusrp1 Name: libusrp Version: @VERSION@ Release: 0