[packages/glibc] Keep locale data in /usr/lib/locale for x86_64 too
jajcus
jajcus at pld-linux.org
Tue Jun 24 14:15:06 CEST 2014
commit d6e3a99e878738b98d3671e8c05589cfe3f8fed1
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Tue Jun 24 14:12:51 2014 +0200
Keep locale data in /usr/lib/locale for x86_64 too
The locale-archive (or data files generated with localedb-gen) is needed
both for 32- and 64-bit binaries. And the same files can be used by
both.
Also: package the /usr/lib/locale directory even when not
building glibc-localedb-all.
glibc.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index a053ed4..29b66cd 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1029,6 +1029,7 @@ AWK="gawk" \
%{__make} \
AWK="gawk" \
+ localedir=%{_prefix}/lib/locale \
sLIBdir=%{_libdir}
cd ..
@@ -1066,13 +1067,17 @@ cd builddir
env LANGUAGE=C LC_ALL=C \
%{__make} install \
install_root=$RPM_BUILD_ROOT \
+ localedir=%{_prefix}/lib/locale \
infodir=%{_infodir} \
mandir=%{_mandir}
%if %{with localedb}
env LANGUAGE=C LC_ALL=C \
%{__make} localedata/install-locales \
+ localedir=%{_prefix}/lib/locale \
install_root=$RPM_BUILD_ROOT
+%else
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/locale
%endif
PICFILES="libc_pic.a libc.map
@@ -1268,7 +1273,7 @@ for i in af be bg ca cs da de el en eo es et eu fi fr ga gl hr hu ia id it ja kk
done
# localedb-gen infrastructure
-sed -e 's, at localedir@,%{_libdir}/locale,' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/localedb-gen
+sed -e 's, at localedir@,%{_prefix}/lib/locale,' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/localedb-gen
chmod +x $RPM_BUILD_ROOT%{_bindir}/localedb-gen
install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
@@ -1435,7 +1440,7 @@ fi
%else
%attr(755,root,root) /%{_lib}/libutil.so.1
%endif
-%{?with_localedb:%dir %{_libdir}/locale}
+%dir %{_prefix}/lib/locale
#%files -n nss_db
%defattr(644,root,root,755)
@@ -1788,7 +1793,7 @@ fi
%if %{with localedb}
%files localedb-all
%defattr(644,root,root,755)
-%{_libdir}/locale/locale-archive
+%{_prefix}/lib/locale/locale-archive
%endif
%files -n iconv
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/d6e3a99e878738b98d3671e8c05589cfe3f8fed1
More information about the pld-cvs-commit
mailing list