Bring back usage of /usr/lib64 instead of /lib64

Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
This commit is contained in:
Zoltan Fridrich 2024-05-28 12:47:34 +02:00
parent d727b736e7
commit 190cc5ce74

View File

@ -104,7 +104,7 @@
%{__arch_install_post} \ %{__arch_install_post} \
%{__os_install_post} \ %{__os_install_post} \
bin_path=%{buildroot}%{_bindir} \ bin_path=%{buildroot}%{_bindir} \
lib_path=%{buildroot}/%{_lib} \ lib_path=%{buildroot}%{_libdir} \
for app in %{apps_hmaccalc}; do \ for app in %{apps_hmaccalc}; do \
test -e "$bin_path"/$app || continue \ test -e "$bin_path"/$app || continue \
{ %sha512hmac "$bin_path"/$app || exit 1; } \\\ { %sha512hmac "$bin_path"/$app || exit 1; } \\\
@ -333,7 +333,7 @@ EOF
%build %build
%configure \ %configure \
--libdir=/%{_lib} \ --libdir=%{_libdir} \
--disable-silent-rules \ --disable-silent-rules \
--enable-kcapi-encapp \ --enable-kcapi-encapp \
--enable-kcapi-dgstapp \ --enable-kcapi-dgstapp \
@ -344,7 +344,7 @@ EOF
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--enable-sum-prefix= \ --enable-sum-prefix= \
--enable-sum-dir=/%{_lib} \ --enable-sum-dir=%{_libdir} \
--with-pkgconfigdir=%{_libdir}/pkgconfig --with-pkgconfigdir=%{_libdir}/pkgconfig
%if %{with doc} %if %{with doc}
%make_build all doc %make_build all doc
@ -454,10 +454,10 @@ popd
%doc %dir %{_pkgdocdir} %doc %dir %{_pkgdocdir}
%doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/README.md
%license COPYING* %license COPYING*
/%{_lib}/%{name}.so.%{vmajor} %{_libdir}/%{name}.so.%{vmajor}
/%{_lib}/%{name}.so.%{version} %{_libdir}/%{name}.so.%{version}
/%{_lib}/fipscheck/%{name}.so.%{vmajor}.hmac %{_libdir}/fipscheck/%{name}.so.%{vmajor}.hmac
/%{_lib}/fipscheck/%{name}.so.%{version}.hmac %{_libdir}/fipscheck/%{name}.so.%{version}.hmac
%if %{with_sysctl_tweak} %if %{with_sysctl_tweak}
%doc %{_pkgdocdir}/README.%{distroname_ext} %doc %{_pkgdocdir}/README.%{distroname_ext}
%{_sysctldir}/%{sysctl_prio}-%{name}-optmem_max.conf %{_sysctldir}/%{sysctl_prio}-%{name}-optmem_max.conf
@ -469,7 +469,7 @@ popd
%doc %{_pkgdocdir}/TODO %doc %{_pkgdocdir}/TODO
%{_includedir}/kcapi.h %{_includedir}/kcapi.h
%{_mandir}/man3/kcapi_*.3.* %{_mandir}/man3/kcapi_*.3.*
/%{_lib}/%{name}.so %{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
@ -486,28 +486,28 @@ popd
%{_bindir}/md5sum %{_bindir}/md5sum
%{_bindir}/sha*sum %{_bindir}/sha*sum
%{_bindir}/sm*sum %{_bindir}/sm*sum
/%{_lib}/fipscheck/md5sum.hmac %{_libdir}/fipscheck/md5sum.hmac
/%{_lib}/fipscheck/sha*sum.hmac %{_libdir}/fipscheck/sha*sum.hmac
/%{_lib}/fipscheck/sm*sum.hmac %{_libdir}/fipscheck/sm*sum.hmac
%endif %endif
%if %{with replace_fipscheck} %if %{with replace_fipscheck}
%files fipscheck %files fipscheck
%{_bindir}/fips* %{_bindir}/fips*
/%{_lib}/fipscheck/fips*.hmac %{_libdir}/fipscheck/fips*.hmac
%endif %endif
%if %{with replace_hmaccalc} %if %{with replace_hmaccalc}
%files hmaccalc %files hmaccalc
%{_bindir}/sha*hmac %{_bindir}/sha*hmac
%{_bindir}/sm*hmac %{_bindir}/sm*hmac
/%{_lib}/hmaccalc/sha*hmac.hmac %{_libdir}/hmaccalc/sha*hmac.hmac
/%{_lib}/hmaccalc/sm*hmac.hmac %{_libdir}/hmaccalc/sm*hmac.hmac
%endif %endif
%files static %files static
/%{_lib}/%{name}.a %{_libdir}/%{name}.a
%files tools %files tools