From f0189cf37c21ef3605382a2dd80d32719844911e7fb72fe44770c7974b7afcaa Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Thu, 31 Aug 2017 05:47:26 +0000
Subject: [PATCH] - Don't install into nsl subdirectories

OBS-URL: https://build.opensuse.org/package/show/network:NIS/libnsl?expand=0&rev=17
---
 libnsl.changes |  5 +++++
 libnsl.spec    | 21 +++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/libnsl.changes b/libnsl.changes
index 58dd276..14f3c3e 100644
--- a/libnsl.changes
+++ b/libnsl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 30 13:35:01 CEST 2017 - kukuk@suse.de
+
+- Don't install into nsl subdirectories
+
 -------------------------------------------------------------------
 Fri Aug 18 19:53:51 UTC 2017 - kukuk@suse.com
 
diff --git a/libnsl.spec b/libnsl.spec
index 5794f09..d54584a 100644
--- a/libnsl.spec
+++ b/libnsl.spec
@@ -66,20 +66,18 @@ The NIS+ API is deprecated and only there "as is".
 %setup -q
 
 %build
-%configure --libdir=/%{_libdir}/nsl --includedir=%{_includedir}/nsl
+%configure
 make %{?_smp_mflags}
 
 %install
 # Don't strip .symtab to allow debugging
 export STRIP_KEEP_SYMTAB=libnsl*.so*
-# NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory
-export NO_BRP_CHECK_ROOTFS=true
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
-mv -v %{buildroot}/%{_libdir}/nsl/%{name}.so.2*  %{buildroot}%{_libdir}/
-# Adjust devel so link
-rm -v %{buildroot}/%{_libdir}/nsl/%{name}.{a,la,so}
-ln -s -v %{_libdir}/%{name}.so.2 %{buildroot}%{_libdir}/nsl/%{name}.so
-mv -v %{buildroot}/%{_libdir}/nsl/pkgconfig %{buildroot}/%{_libdir}
+# Remove .la file
+rm %{buildroot}%{_libdir}/%{name}.la
+
+# temporary remove header file conflicting with sunrpc
+rm %{buildroot}%{_includedir}/rpcsvc/yppasswd.h
 
 %check
 make %{?_smp_mflags} check
@@ -94,10 +92,9 @@ make %{?_smp_mflags} check
 
 %files devel
 %defattr(-,root,root)
-%dir %{_libdir}/nsl/
-%{_libdir}/nsl/libnsl.so
-%dir %{_includedir}/nsl/
-%{_includedir}/nsl/*
+%{_libdir}/libnsl.so
+%{_libdir}/libnsl.a
+%{_includedir}/*
 %{_libdir}/pkgconfig/*
 
 %changelog