[packages/glibc] for fixed localedir no need for build time subst
glen
glen at pld-linux.org
Sat May 9 10:08:00 CEST 2015
commit 09df111ec1c5ddf26ff977ca120aea784f01cc8f
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat May 9 11:07:26 2015 +0300
for fixed localedir no need for build time subst
glibc-localedb-gen | 2 +-
glibc.spec | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 4307b7e..a99b907 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1258,8 +1258,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@,%{_prefix}/lib/locale,' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/localedb-gen
-chmod +x $RPM_BUILD_ROOT%{_bindir}/localedb-gen
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/localedb-gen
cp -p localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
# shutup check-files
diff --git a/glibc-localedb-gen b/glibc-localedb-gen
index dfaea80..74265ea 100644
--- a/glibc-localedb-gen
+++ b/glibc-localedb-gen
@@ -7,7 +7,7 @@ DESTDIR=
[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
[ -f /etc/sysconfig/localedb ] && . /etc/sysconfig/localedb
-LOCDIR=@localedir@
+LOCDIR=/usr/lib/locale
ARCHIVE=${LOCDIR}/locale-archive
while [ $# -gt 0 ]; do
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/09df111ec1c5ddf26ff977ca120aea784f01cc8f
More information about the pld-cvs-commit
mailing list