From e3397013c57b7cdcb40019f92fe8b106d14b25881b30f3f3f4e688976d06d092 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 20 Nov 2020 10:15:14 +0000
Subject: [PATCH] Accepting request 849602 from home:lnussel:usrmove

- move libs to %_libdir (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849602
OBS-URL: https://build.opensuse.org/package/show/security/fipscheck?expand=0&rev=23
---
 fipscheck.changes |  5 +++++
 fipscheck.spec    | 16 ++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/fipscheck.changes b/fipscheck.changes
index 2a5e44c..c57ec01 100644
--- a/fipscheck.changes
+++ b/fipscheck.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 20 09:50:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- move libs to %_libdir (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Sep 16 10:48:51 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
 
diff --git a/fipscheck.spec b/fipscheck.spec
index d6af6f8..4f2d7d4 100644
--- a/fipscheck.spec
+++ b/fipscheck.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fipscheck
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -63,7 +63,7 @@ This package contains development files for %{name}.
 %patch2 -p1
 
 %build
-%configure --disable-static --libdir=/%{_lib}
+%configure --disable-static
 
 make %{?_smp_mflags} LDFLAGS="-Wl,-z,relro"
 
@@ -73,18 +73,14 @@ make %{?_smp_mflags} LDFLAGS="-Wl,-z,relro"
     %{__arch_install_post} \
     %__os_install_post \
     %{buildroot}%{_bindir}/fipshmac %{buildroot}%{_bindir}/fipscheck \
-    %{buildroot}%{_bindir}/fipshmac %{buildroot}/%{_lib}/libfipscheck.so.%{soversion} \
-    ln -s .libfipscheck.so.%{soversion}.hmac %{buildroot}/%{_lib}/.libfipscheck.so.%{somajor}.hmac \
+    %{buildroot}%{_bindir}/fipshmac %{buildroot}/%{_libdir}/libfipscheck.so.%{soversion} \
+    ln -s .libfipscheck.so.%{soversion}.hmac %{buildroot}/%{_libdir}/.libfipscheck.so.%{somajor}.hmac \
 %{nil}
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-mkdir -p %{buildroot}%{_libdir}
-ln -s  /%{_lib}/libfipscheck.so.%{soversion} %{buildroot}%{_libdir}/libfipscheck.so
-rm %{buildroot}/%{_lib}/libfipscheck.so
-
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
 
@@ -96,8 +92,8 @@ rm %{buildroot}/%{_lib}/libfipscheck.so
 %{_bindir}/fipshmac
 
 %files -n %{lname}
-/%{_lib}/libfipscheck.so.*
-/%{_lib}/.libfipscheck.so.*
+%{_libdir}/libfipscheck.so.*
+%{_libdir}/.libfipscheck.so.*
 %{_mandir}/man8/*.8%{?ext_man}
 
 %files devel