From 453b60105c2ca6897c5f63e68468b2ad24ac3ca2 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 15 Jul 2021 06:55:15 -0400
Subject: [PATCH] Bring back usage of /usr/lib64 instead of /lib64 Resolves:
 rhbz#1982620

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 libkcapi.spec | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/libkcapi.spec b/libkcapi.spec
index 2a863ce..7818f51 100644
--- a/libkcapi.spec
+++ b/libkcapi.spec
@@ -106,7 +106,7 @@
 %{__arch_install_post}                                           \
 %{__os_install_post}                                             \
 bin_path=%{buildroot}%{_bindir}                                  \
-lib_path=%{buildroot}/%{_lib}                                    \
+lib_path=%{buildroot}%{_libdir}                                  \
 for app in %{apps_hmaccalc}; do                                  \
   test -e "$bin_path"/$app || continue                           \
   { %sha512hmac "$bin_path"/$app || exit 1; }                    \\\
@@ -125,7 +125,7 @@ done                                                             \
 
 Name:           libkcapi
 Version:        %{vmajor}.%{vminor}.%{vpatch}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        User space interface to the Linux Kernel Crypto API
 
 License:        BSD or GPLv2
@@ -331,7 +331,7 @@ EOF
 
 %build
 %configure               \
-  --libdir=/%{_lib}      \
+  --libdir=%{_libdir}  \
   --disable-silent-rules \
   --enable-kcapi-encapp  \
   --enable-kcapi-dgstapp \
@@ -342,7 +342,7 @@ EOF
   --enable-shared        \
   --enable-static        \
   --enable-sum-prefix=   \
-  --enable-sum-dir=/%{_lib} \
+  --enable-sum-dir=%{_libdir} \
   --with-pkgconfigdir=%{_libdir}/pkgconfig
 %if %{with doc}
 %make_build all doc
@@ -448,10 +448,10 @@ popd
 %doc %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/README.md
 %license COPYING*
-/%{_lib}/%{name}.so.%{vmajor}
-/%{_lib}/%{name}.so.%{version}
-/%{_lib}/fipscheck/%{name}.so.%{vmajor}.hmac
-/%{_lib}/fipscheck/%{name}.so.%{version}.hmac
+%{_libdir}/%{name}.so.%{vmajor}
+%{_libdir}/%{name}.so.%{version}
+%{_libdir}/fipscheck/%{name}.so.%{vmajor}.hmac
+%{_libdir}/fipscheck/%{name}.so.%{version}.hmac
 %if %{with_sysctl_tweak}
 %doc %{_pkgdocdir}/README.%{distroname_ext}
 %{_sysctldir}/%{sysctl_prio}-%{name}-optmem_max.conf
@@ -463,7 +463,7 @@ popd
 %doc %{_pkgdocdir}/TODO
 %{_includedir}/kcapi.h
 %{_mandir}/man3/kcapi_*.3.*
-/%{_lib}/%{name}.so
+%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 
@@ -479,25 +479,25 @@ popd
 %files          checksum
 %{_bindir}/md5sum
 %{_bindir}/sha*sum
-/%{_lib}/fipscheck/md5sum.hmac
-/%{_lib}/fipscheck/sha*sum.hmac
+%{_libdir}/fipscheck/md5sum.hmac
+%{_libdir}/fipscheck/sha*sum.hmac
 %endif
 
 %if %{with replace_fipscheck}
 %files          fipscheck
 %{_bindir}/fips*
-/%{_lib}/fipscheck/fips*.hmac
+%{_libdir}/fipscheck/fips*.hmac
 %endif
 
 %if %{with replace_hmaccalc}
 %files          hmaccalc
 %{_bindir}/sha*hmac
-/%{_lib}/hmaccalc/sha*hmac.hmac
+%{_libdir}/hmaccalc/sha*hmac.hmac
 %endif
 
 
 %files          static
-/%{_lib}/%{name}.a
+%{_libdir}/%{name}.a
 
 
 %files          tools
@@ -512,6 +512,10 @@ popd
 
 
 %changelog
+* Thu Jul 15 2021 Simo Sorce <simo@redhat.com> - 1.3.1-2
+- Bring back usage of %{_libdir} instead of /%{_lib}
+- Resolves: rhbz#1982620
+
 * Wed Jul 14 2021 Simo Sorce <simo@redhat.com> - 1.3.1-1
 - Update to new upstream release 1.3.1
 - This fixes ABI issues and incorporates previous patches