From 48d2cdb40f25689c11fac311bad5100eafe4f0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 12 Nov 2021 21:58:40 +0100 Subject: [PATCH] Add logic for closing the loop hole on soname bumps Explicitly force manual intervention for soname bumps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- libnsl2.spec | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/libnsl2.spec b/libnsl2.spec index 4dfb20b..f825c04 100644 --- a/libnsl2.spec +++ b/libnsl2.spec @@ -1,21 +1,28 @@ -%global commit0 4a062cf4180d99371198951e4ea5b4550efd58a3 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +# Uncomment on initial build for soname bump. +%global bump_soname 1 +%global sover 3 +%if 0%{?bump_soname} +%global relsuffix ~sonamebump +%global old_sover %(echo $((%{sover}-1))) +%endif Name: libnsl2 Version: 2.0.0 -Release: 1%{?dist} +Release: 1%{?relsuffix}%{?dist} Summary: Public client interface library for NIS(YP) and NIS+ License: BSD and LGPLv2+ URL: https://github.com/thkukuk/libnsl - Source0: https://github.com/thkukuk/libnsl/archive/v%{version}.tar.gz BuildRequires: autoconf, automake, gettext-devel, libtool, libtirpc-devel BuildRequires: make BuildRequires: gcc +%if 0%{?bump_soname} +BuildRequires: libnsl.so.%{old_sover} +%endif %description This package contains the libnsl library. This library contains @@ -38,24 +45,28 @@ Development files for libnsl2 %build autoreconf -fiv -%configure\ - --libdir=%{_libdir}\ +%configure \ + --libdir=%{_libdir} \ --includedir=%{_includedir} %make_build %install - %make_install -rm %{buildroot}/%{_libdir}/libnsl.a -rm %{buildroot}/%{_libdir}/libnsl.la +rm %{buildroot}%{_libdir}/libnsl.{a,la} + +%if 0%{?bump_soname} +cp -p %{_libdir}/libnsl.so.%{old_sover}* %{buildroot}%{_libdir} +%endif %files -%{_libdir}/libnsl.so.* - %license COPYING +%{_libdir}/libnsl.so.%{sover}* +%if 0%{?bump_soname} +%{_libdir}/libnsl.so.%{old_sover}* +%endif %files devel %{_libdir}/libnsl.so @@ -63,6 +74,10 @@ rm %{buildroot}/%{_libdir}/libnsl.la %{_libdir}/pkgconfig/libnsl.pc %changelog +* Thu Nov 11 2021 Björn Esser - 2.0.0-1 +- Add logic for closing the loop hole on soname bumps +- Explicitly force manual intervention for soname bumps + * Thu Nov 11 2021 Matej Mužila - 2.0.0-1 - Rebase to new upstream version @@ -127,4 +142,3 @@ rm %{buildroot}/%{_libdir}/libnsl.la * Mon Apr 10 2017 Matej Mužila 1.0.4-4 - Initial version for 1.0.4 -