diff --git a/glibc.changes b/glibc.changes index 4e12d7b..d5fa6c5 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 1 16:43:55 UTC 2021 - Andreas Schwab + +- Fix build of utils flavor for usrmerge + ------------------------------------------------------------------- Thu Feb 18 11:29:12 UTC 2021 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index 1df418f..7968a79 100644 --- a/glibc.spec +++ b/glibc.spec @@ -423,6 +423,7 @@ which is highly discouraged. + # makedb requires libselinux. We add this program in a separate # package so that glibc does not require libselinux. @@ -922,7 +923,11 @@ rm -f %{buildroot}%{slibdir}/ld*.so* %{buildroot}%{slibdir}/lib[!mp]* %if "%{rtlddir}" != "%{slibdir}" rm -f %{buildroot}%{rtlddir}/ld*.so* %endif +%if "%{_libdir}" != "%{slibdir}" rm -f %{buildroot}%{_libdir}/lib* +%else +rm -f %{buildroot}%{_libdir}/lib*.a +%endif rm -f %{buildroot}%{_bindir}/{catchsegv,ldd*,sprof} rm -rf %{buildroot}%{_mandir}/man* rm -rf %{buildroot}%{rootsbindir} %{buildroot}%{_includedir}