diff --git a/glibc.spec b/glibc.spec index 621fb5e..e07319a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -84,7 +84,7 @@ Name: glibc Version: 2.35 -Release: 1mamba +Release: 2mamba Summary: The GNU libc libraries Group: System/Libraries Vendor: openmamba @@ -532,6 +532,7 @@ ln -s ../lib/locale %{buildroot}/usr/lib32/locale # WORKAROUND: worked up to 2.21 mkdir -p %{buildroot}%{_prefix}/lib/locale make LOCALEDEF="I18NPATH=. LC_ALL=C localedef" localedata/install-locales -C ../glibc-build install_root=%{buildroot} + install -d -m0755 %{buildroot}%{glibc_prefix}/lib/locale/ mv %{buildroot}%{_prefix}/lib/locale/* %{buildroot}%{glibc_prefix}/lib/locale/ %endif mv localedata/SUPPORTED localedata/SUPPORTED.openmamba @@ -618,17 +619,17 @@ cp -a ../glibc-build/manual/libc/* %{buildroot}%{_docdir}/libc/html/ cp -a ../glibc-build/manual/libc.pdf %{buildroot}%{_docdir}/libc/ %endif -# provide legacy /lib[64] after glibc migration to /usr/lib[64] -install -d -m0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d -%ifarch x86_64 aarch64 -cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc64.conf << __EOF -/%{_lib} -__EOF -%else -cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc.conf << __EOF -/%{_lib} -__EOF -%endif +## provide legacy /lib[64] after glibc migration to /usr/lib[64] +#install -d -m0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d +#%ifarch x86_64 aarch64 +#cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc64.conf << __EOF +#/%{_lib} +#__EOF +#%else +#cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/glibc.conf << __EOF +#/%{_lib} +#__EOF +#%endif %endif %endif @@ -842,7 +843,7 @@ fi %if "%{_target_platform}" == "%{_host}" %files %defattr(-,root,root) -%{_sysconfdir}/ld.so.conf.d/glibc*.conf +#%{_sysconfdir}/ld.so.conf.d/glibc*.conf %config(noreplace) %{_sysconfdir}/rpc %attr(0755,-,-) /%{slibdir}/lib*.so.* %ifarch aarch64 @@ -990,6 +991,9 @@ fi %endif %changelog +* Thu Jun 16 2022 Silvan Calarco 2.35-2mamba +- remove /etc/ld.so.conf/glibc[64].conf files adding /lib[64] before usr-merge to fix e.g. apps based on QtWebEngine + * Sat Feb 05 2022 Automatic Build System 2.35-1mamba - automatic version update by autodist