diff --git a/libxcrypt.spec b/libxcrypt.spec index a590860ea8614adb0c5ee23a1d5e42678906a64a..148c4a14d5ad453be0690007fcca6c4b7f6207db 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without new_api %bcond_without compat_pkg @@ -66,35 +66,35 @@ --with-pkgconfigdir=%{_libdir}/pkgconfig -%global _fipsdir %{_libdir}/fipscheck - - -%define __spec_install_post \ -%{?__debug_package:%{__debug_install_post}} \ -%{__arch_install_post} \ -%{__os_install_post} \ -libdir="%{buildroot}%{_libdir}" \ -fipsdir="$libdir/fipscheck" \ -mkdir -p $fipsdir \ -fipshmac -d $fipsdir \\\ - $libdir/libcrypt.so.%{sov} \ -ln -s libcrypt.so.%{sov}.hmac \\\ - $fipsdir/libcrypt.so.%{soc}.hmac \ -if [[ %{with staticlib} == 1 ]]; then \ - fipshmac -d $fipsdir \\\ - $libdir/libcrypt.a \ - if [[ %{without new_api} == 1 ]]; then \ - ln -s .libcrypt.a.hmac \\\ - $fipsdir/libxcrypt.a.hmac \ - fi \ -fi \ -if [[ %{with compat_pkg} == 1 ]]; then \ - fipshmac -d $fipsdir \\\ - $libdir/libcrypt.so.%{csov} \ - ln -s libcrypt.so.%{csov}.hmac \\\ - $fipsdir/libcrypt.so.%{csoc}.hmac \ -fi \ -%{nil} +#%global _fipsdir %{_libdir}/fipscheck + +# skip fipshmac -d as build err +#%define __spec_install_post \ +#%{?__debug_package:%{__debug_install_post}} \ +#%{__arch_install_post} \ +#%{__os_install_post} \ +#libdir="%{buildroot}%{_libdir}" \ +#fipsdir="$libdir/fipscheck" \ +#mkdir -p $fipsdir \ +#fipshmac -d $fipsdir \\\ +# $libdir/libcrypt.so.%{sov} \ +#ln -s libcrypt.so.%{sov}.hmac \\\ +# $fipsdir/libcrypt.so.%{soc}.hmac \ +#if [[ %{with staticlib} == 1 ]]; then \ +# fipshmac -d $fipsdir \\\ +# $libdir/libcrypt.a \ +# if [[ %{without new_api} == 1 ]]; then \ +# ln -s .libcrypt.a.hmac \\\ +# $fipsdir/libxcrypt.a.hmac \ +# fi \ +#fi \ +#if [[ %{with compat_pkg} == 1 ]]; then \ +# fipshmac -d $fipsdir \\\ +# $libdir/libcrypt.so.%{csov} \ +# ln -s libcrypt.so.%{csov}.hmac \\\ +# $fipsdir/libcrypt.so.%{csoc}.hmac \ +#fi \ +#%{nil} %global _ld_strict_symbol_defs 1 @@ -377,11 +377,11 @@ for dir in ${build_dirs}; do done %files -%dir %{_fipsdir} +#%dir %{_fipsdir} %doc %dir %{_pkgdocdir} %license COPYING.LIB LICENSING -%{_fipsdir}/libcrypt.so.%{soc}.hmac -%{_fipsdir}/libcrypt.so.%{sov}.hmac +#%{_fipsdir}/libcrypt.so.%{soc}.hmac +#%{_fipsdir}/libcrypt.so.%{sov}.hmac %{_libdir}/libcrypt.so.%{soc} %{_libdir}/libcrypt.so.%{sov} %{_mandir}/man5/crypt.5* @@ -389,12 +389,12 @@ done %if %{with compat_pkg} %files compat -%dir %{_fipsdir} +#%dir %{_fipsdir} %if %{with enosys_stubs} %doc %{_pkgdocdir}/README.posix %endif -%{_fipsdir}/libcrypt.so.%{csoc}.hmac -%{_fipsdir}/libcrypt.so.%{csov}.hmac +#%{_fipsdir}/libcrypt.so.%{csoc}.hmac +#%{_fipsdir}/libcrypt.so.%{csov}.hmac %{_libdir}/libcrypt.so.%{csoc} %{_libdir}/libcrypt.so.%{csov} %endif @@ -426,11 +426,11 @@ done %if %{with staticlib} %files static -%dir %{_fipsdir} +#%dir %{_fipsdir} %doc %{_pkgdocdir}/README.static -%{_fipsdir}/libcrypt.a.hmac +#%{_fipsdir}/libcrypt.a.hmac %if %{without new_api} -%{_fipsdir}/libxcrypt.a.hmac +#%{_fipsdir}/libxcrypt.a.hmac %endif %{_libdir}/libcrypt.a %if %{without new_api} @@ -452,6 +452,9 @@ done %changelog +* Sat Oct 11 2025 mgb01105731 - 4.4.36-2 +- skip build err + * Fri Nov 10 2023 Funda Wang - 4.4.36-1 - New version 4.4.36