From 85562f0afdc9036df3627384d6331872f39f8fea Mon Sep 17 00:00:00 2001
From: Matej Muzila <mmuzila@redhat.com>
Date: Fri, 9 Feb 2018 15:57:48 +0100
Subject: [PATCH] Update to version 1.2.0

Change libdir and includedir
---
 .gitignore   |  1 +
 libnsl2.spec | 35 +++++++++++++++++------------------
 sources      |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index e922db1..b35d8bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libnsl-libnsl-1.0.4.tar.gz
 /libnsl-libnsl-1.0.5.tar.gz
 /libnsl-libnsl-1.1.0.tar.gz
+/libnsl-1.2.0.tar.gz
diff --git a/libnsl2.spec b/libnsl2.spec
index 6476d47..b6151bc 100644
--- a/libnsl2.spec
+++ b/libnsl2.spec
@@ -1,6 +1,6 @@
 Name:       libnsl2
-Version:    1.1.0
-Release:    2%{?dist}
+Version:    1.2.0
+Release:    1%{?dist}
 Summary:    Public client interface library for NIS(YP) and NIS+
 
 License:    BSD and LGPLv2+
@@ -8,7 +8,7 @@ Group:      System Environment/Libraries
 URL:        https://github.com/thkukuk/libnsl
 
 
-Source0:    https://github.com/thkukuk/libnsl/archive/libnsl-%{version}.tar.gz#/libnsl-libnsl-%{version}.tar.gz
+Source0:    https://github.com/thkukuk/libnsl/archive/libnsl-%{version}.tar.gz#/libnsl-%{version}.tar.gz
 
 Patch0: libnsl2-1.0.5-include_stdint.patch
 
@@ -24,13 +24,14 @@ be able to link against TI-RPC for IPv6 support.
 Summary: Development files for libnsl
 Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Conflicts: glibc-devel < 2.26.9000-40
 
 %description devel
 Development files for libnsl2
 
 
 %prep
-%setup -q -n libnsl-libnsl-%{version}
+%setup -q -n libnsl-%{version}
 
 %patch0 -p1 -b .include_stdint
 
@@ -41,8 +42,8 @@ export CFLAGS="%{optflags}"
 autoreconf -fiv
 
 %configure\
-    --libdir=%{_libdir}/nsl\
-    --includedir=%{_includedir}/nsl\
+    --libdir=%{_libdir}\
+    --includedir=%{_includedir}
 
 %make_build
 
@@ -51,32 +52,30 @@ autoreconf -fiv
 
 %make_install
 
-rm %{buildroot}/%{_libdir}/nsl/libnsl.a
-rm %{buildroot}/%{_libdir}/nsl/libnsl.la
-mv %{buildroot}/%{_libdir}/nsl/pkgconfig %{buildroot}/%{_libdir}
-
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/nsl" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+rm %{buildroot}/%{_libdir}/libnsl.a
+rm %{buildroot}/%{_libdir}/libnsl.la
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
 %files
-%dir %{_libdir}/nsl
-%{_libdir}/nsl/libnsl.so.2
-%{_libdir}/nsl/libnsl.so.2.0.0
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
+%{_libdir}/libnsl.so.2
+%{_libdir}/libnsl.so.2.0.0
 
 %license COPYING
 
 
 %files devel
-%{_libdir}/nsl/libnsl.so
-%{_includedir}/nsl/
+%{_libdir}/libnsl.so
+%{_includedir}/*
 %{_libdir}/pkgconfig/libnsl.pc
 
 %changelog
+* Fri Feb 09 2018 Matej Mužila <mmuzila@reedhat.com> - 1.2.0-1
+- Update to version 1.2.0
+- Change libdir and includedir
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 3ea0b26..7903fb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libnsl-libnsl-1.1.0.tar.gz) = 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd
+SHA512 (libnsl-1.2.0.tar.gz) = 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8