From b61c8309a3967653b1d33dedd61999e4272c003b9f189a98c3c9247937eed346 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Fri, 20 Nov 2020 16:23:16 +0000
Subject: [PATCH] Accepting request 849635 from home:lnussel:usrmove

- install libraries to %{_libdir} (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849635
OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=88
---
 libtirpc.changes |  5 +++++
 libtirpc.spec    | 11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libtirpc.changes b/libtirpc.changes
index b5d8340..568d0e2 100644
--- a/libtirpc.changes
+++ b/libtirpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 29 10:45:54 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- install libraries to %{_libdir} (boo#1029961)
+
 -------------------------------------------------------------------
 Wed Apr 15 10:32:08 UTC 2020 - Petr Vorel <pvorel@suse.cz>
 
diff --git a/libtirpc.spec b/libtirpc.spec
index bfc3a3d..a1f4946 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -75,8 +75,7 @@ TCP over IPv4.
 
 %build
 sed -i -e 's|@includedir@/tirpc|@includedir@|g' libtirpc.pc.in
-%configure --disable-static \
-		--libdir=/%{_lib}
+%configure --disable-static
 %make_build %{?_smp_mflags}
 
 %install
@@ -87,9 +86,7 @@ export NO_BRP_CHECK_ROOTFS=true
 %make_install
 # move devel so link to _libdir
 mkdir -p %{buildroot}/%{_libdir}
-ln -sv /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
-rm -v %{buildroot}/%{_lib}/%{name}.{la,so}
-mv -v %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}
+rm -v %{buildroot}%{_libdir}/%{name}.la
 # Move RPC headers from tirpc subdirectory into main directory,
 # they are now default
 mv -v %{buildroot}%{_includedir}/tirpc/* %{buildroot}%{_includedir}
@@ -103,7 +100,7 @@ rm -v %{buildroot}/etc/bindresvport.blacklist
 %files -n libtirpc3
 %defattr(-,root,root)
 %license COPYING
-/%{_lib}/libtirpc.so.3*
+%{_libdir}/libtirpc.so.3*
 
 %files netconfig
 %defattr(-,root,root)
@@ -114,7 +111,7 @@ rm -v %{buildroot}/etc/bindresvport.blacklist
 %defattr(-,root,root)
 %{_libdir}/libtirpc.so
 /usr/include/*
-/usr/%{_lib}/pkgconfig/*
+%{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
 
 %changelog