From 03800c1a3c4b81fa97024d117d30732a421ecb37 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 1 Mar 2022 07:10:06 -0500 Subject: [PATCH] import libnsl2-2.0.0-1.el9 --- .gitignore | 2 +- .libnsl2.metadata | 2 +- SOURCES/libnsl2-1.0.5-include_stdint.patch | 10 ----- SPECS/libnsl2.spec | 49 +++++++++++++--------- 4 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 SOURCES/libnsl2-1.0.5-include_stdint.patch diff --git a/.gitignore b/.gitignore index 81ab3db..71d37df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.3.0.tar.gz +SOURCES/v2.0.0.tar.gz diff --git a/.libnsl2.metadata b/.libnsl2.metadata index a9ff7eb..3e60ae4 100644 --- a/.libnsl2.metadata +++ b/.libnsl2.metadata @@ -1 +1 @@ -abc8ec64585499fc5b291de2df30838b4f5e123a SOURCES/v1.3.0.tar.gz +f727e4e0bbf233a2367465bcbaed546ab4875744 SOURCES/v2.0.0.tar.gz diff --git a/SOURCES/libnsl2-1.0.5-include_stdint.patch b/SOURCES/libnsl2-1.0.5-include_stdint.patch deleted file mode 100644 index 77abefa..0000000 --- a/SOURCES/libnsl2-1.0.5-include_stdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnsl-libnsl-1.0.5/src/nisplus/nis_call.c.include_stdint 2017-06-12 16:05:36.864341686 +0200 -+++ libnsl-libnsl-1.0.5/src/nisplus/nis_call.c 2017-06-12 16:05:56.745337017 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "libc-lock.h" - #include "nis_intern.h" diff --git a/SPECS/libnsl2.spec b/SPECS/libnsl2.spec index 5ab5549..aaf818c 100644 --- a/SPECS/libnsl2.spec +++ b/SPECS/libnsl2.spec @@ -1,26 +1,32 @@ -%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: 1.3.0 -Release: 4%{?dist} +Version: 2.0.0 +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 -Patch0: libnsl2-1.0.5-include_stdint.patch - BuildRequires: autoconf, automake, gettext-devel, libtool, libtirpc-devel BuildRequires: make +BuildRequires: gcc +%if 0%{?bump_soname} +BuildRequires: libnsl2 < %{version} +%endif %description This package contains the libnsl library. This library contains -the public client interface for NIS(YP) and NIS+. +the public client interface for NIS(YP). This code was formerly part of glibc, but is now standalone to be able to link against TI-RPC for IPv6 support. @@ -36,32 +42,31 @@ Development files for libnsl2 %prep %setup -q -n libnsl-%{version} -%patch0 -p1 -b .include_stdint - %build - -export CFLAGS="%{optflags}" - 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 @@ -69,6 +74,10 @@ rm %{buildroot}/%{_libdir}/libnsl.la %{_libdir}/pkgconfig/libnsl.pc %changelog +* Thu Jan 20 2022 Alexander Bokovoy - 2.0.0-1 +- Rebase to upstream 2.0.0 release +- Resolves: rhbz#2039220 + * Mon Aug 09 2021 Mohan Boddu - 1.3.0-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688