Bring back usage of /usr/lib64 instead of /lib64
Resolves: rhbz#1982620 Signed-off-by: Simo Sorce <simo@redhat.com>
This commit is contained in:
parent
e277516d55
commit
453b60105c
@ -106,7 +106,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; } \\\
|
||||||
@ -125,7 +125,7 @@ done \
|
|||||||
|
|
||||||
Name: libkcapi
|
Name: libkcapi
|
||||||
Version: %{vmajor}.%{vminor}.%{vpatch}
|
Version: %{vmajor}.%{vminor}.%{vpatch}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: User space interface to the Linux Kernel Crypto API
|
Summary: User space interface to the Linux Kernel Crypto API
|
||||||
|
|
||||||
License: BSD or GPLv2
|
License: BSD or GPLv2
|
||||||
@ -331,7 +331,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 \
|
||||||
@ -342,7 +342,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
|
||||||
@ -448,10 +448,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
|
||||||
@ -463,7 +463,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
|
||||||
|
|
||||||
|
|
||||||
@ -479,25 +479,25 @@ popd
|
|||||||
%files checksum
|
%files checksum
|
||||||
%{_bindir}/md5sum
|
%{_bindir}/md5sum
|
||||||
%{_bindir}/sha*sum
|
%{_bindir}/sha*sum
|
||||||
/%{_lib}/fipscheck/md5sum.hmac
|
%{_libdir}/fipscheck/md5sum.hmac
|
||||||
/%{_lib}/fipscheck/sha*sum.hmac
|
%{_libdir}/fipscheck/sha*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
|
||||||
/%{_lib}/hmaccalc/sha*hmac.hmac
|
%{_libdir}/hmaccalc/sha*hmac.hmac
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
/%{_lib}/%{name}.a
|
%{_libdir}/%{name}.a
|
||||||
|
|
||||||
|
|
||||||
%files tools
|
%files tools
|
||||||
@ -512,6 +512,10 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jul 14 2021 Simo Sorce <simo@redhat.com> - 1.3.1-1
|
||||||
- Update to new upstream release 1.3.1
|
- Update to new upstream release 1.3.1
|
||||||
- This fixes ABI issues and incorporates previous patches
|
- This fixes ABI issues and incorporates previous patches
|
||||||
|
Loading…
Reference in New Issue
Block a user