From 190cc5ce74ef9d1db1d6d7ca0515e87f1373faef Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Tue, 28 May 2024 12:47:34 +0200 Subject: [PATCH] Bring back usage of /usr/lib64 instead of /lib64 Signed-off-by: Zoltan Fridrich --- libkcapi.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libkcapi.spec b/libkcapi.spec index 937fb31..e523ba6 100644 --- a/libkcapi.spec +++ b/libkcapi.spec @@ -104,7 +104,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; } \\\ @@ -333,7 +333,7 @@ EOF %build %configure \ - --libdir=/%{_lib} \ + --libdir=%{_libdir} \ --disable-silent-rules \ --enable-kcapi-encapp \ --enable-kcapi-dgstapp \ @@ -344,7 +344,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 @@ -454,10 +454,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 @@ -469,7 +469,7 @@ popd %doc %{_pkgdocdir}/TODO %{_includedir}/kcapi.h %{_mandir}/man3/kcapi_*.3.* -/%{_lib}/%{name}.so +%{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc @@ -486,28 +486,28 @@ popd %{_bindir}/md5sum %{_bindir}/sha*sum %{_bindir}/sm*sum -/%{_lib}/fipscheck/md5sum.hmac -/%{_lib}/fipscheck/sha*sum.hmac -/%{_lib}/fipscheck/sm*sum.hmac +%{_libdir}/fipscheck/md5sum.hmac +%{_libdir}/fipscheck/sha*sum.hmac +%{_libdir}/fipscheck/sm*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 %{_bindir}/sm*hmac -/%{_lib}/hmaccalc/sha*hmac.hmac -/%{_lib}/hmaccalc/sm*hmac.hmac +%{_libdir}/hmaccalc/sha*hmac.hmac +%{_libdir}/hmaccalc/sm*hmac.hmac %endif %files static -/%{_lib}/%{name}.a +%{_libdir}/%{name}.a %files tools