From e7fa67405d85f859d6887298097a22d37a9f9ea3 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Thu, 20 Jan 2022 15:37:24 +0200
Subject: [PATCH] Rebase to upstream 2.0.0 release

Resolves: rhbz#2039220

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
---
 .gitignore                         |  1 +
 libnsl2-1.0.5-include_stdint.patch | 10 ------
 libnsl2.spec                       | 49 ++++++++++++++++++------------
 sources                            |  2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 libnsl2-1.0.5-include_stdint.patch

diff --git a/.gitignore b/.gitignore
index dd78be9..bf724c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /libnsl-1.2.0.tar.gz
 /libnsl-4a062cf4180d99371198951e4ea5b4550efd58a3.tar.gz
 /v1.3.0.tar.gz
+/v2.0.0.tar.gz
diff --git a/libnsl2-1.0.5-include_stdint.patch b/libnsl2-1.0.5-include_stdint.patch
deleted file mode 100644
index 77abefa..0000000
--- a/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 <unistd.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <stdint.h>
- 
- #include "libc-lock.h"
- #include "nis_intern.h"
diff --git a/libnsl2.spec b/libnsl2.spec
index 5ab5549..aaf818c 100644
--- a/libnsl2.spec
+++ b/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 <abokovoy@redhat.com> - 2.0.0-1
+- Rebase to upstream 2.0.0 release
+- Resolves: rhbz#2039220
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.0-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index 245f795..77cbaff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.3.0.tar.gz) = ce75ee9e54f1bdd2b31886e8157ff5f654511c3da017e0d9f8d0da6a2a9f9a78ff2e5f72cfb7ce3a23065f57337db51e3c8842a7e990350a62612018f4960342
+SHA512 (v2.0.0.tar.gz) = 86a7738707a3e4e56b60c8de0445fb576e66148bc12fa2a6aab422ea81eb4b42be3287a12f78384acd2b8bfb3885e9a0ce4f7328f078da3a5099acb66a35a935