Install glibc-locale files in /emulsubmit/tizen_common/20140513.140658submit/tizen_common/20140425.153946

These files are required for some gettext tools to work properly.
Such tool is msgmerge, which fails with following message:

msgmerge: Cannot convert from "ISO-8859-1" to "UTF-8". msgmerge
relies on iconv(), and iconv() does not support this conversion.
msgmerge for nb.po failed!

Also change chmod 777 to 755 for /emul

Change-Id: Iab1fa355521856511cb8c01b7658e8d97090e7a8
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>

4 files changed, 36 insertions, 8 deletions

diff --git a/packaging/qemu-accel-armv7el.spec b/packaging/qemu-accel-armv7el.spec
index c851a8b..1482e00 100644
--- a/packaging/qemu-accel-armv7el.spec
+++ b/packaging/qemu-accel-armv7el.spec
@@ -154,7 +154,7 @@ cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
 # And extract it for direct usage
 tar xvz -C %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env} -f /usr/share/icecream-envs/cross-armv7el-gcc47-icecream-backend_*.tar.gz
 # It needs a tmp working directory which is writable
-install -d -m0777 %buildroot%{our_path}/usr/share/icecream-envs
+install -d -m0755 %buildroot%{our_path}/usr/share/icecream-envs
 %endif
 
 for binary in $binaries
@@ -234,7 +234,7 @@ exec -a /usr/bin/as %{our_path}/usr/bin/as.real -meabi=5 "$@"
 chmod +x %{buildroot}%{our_path}/usr/bin/as
 
 # allow abuild to do the mv
-chmod 777 %{buildroot}/emul
+chmod 755 %{buildroot}/emul
 
 # make cross ld work with emulated compilers
 mv %{buildroot}%{our_path}/usr/arm-tizen-linux-gnueabi/bin/ld{,.real}
@@ -279,6 +279,13 @@ cp -L /usr/bin/qemu-arm{,-binfmt} %buildroot/qemu/
 
 export NO_BRP_CHECK_RPATH="true"
 
+# Install glibc-locale, otherwise msgmerge >= 0.18.3 fails
+cp -R /usr/lib/{gconv,locale} %{buildroot}%{our_path}/usr/lib
+cp -R /usr/share/locale %{buildroot}%{our_path}/usr/share
+# Fix permissions for abuild
+chmod 755 %{buildroot}%{our_path}/usr/lib/{gconv,locale}
+chmod 755 %{buildroot}%{our_path}/usr/share/locale
+
 %post
 set -x
 if [ $(uname -m) = armv7l ]; then
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index fb85986..25d5e62 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -104,7 +104,7 @@ cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
 # And extract it for direct usage
 tar xvz -C %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env} -f /usr/share/icecream-envs/cross-armv7hl-gcc48-icecream-backend_*.tar.gz
 # It needs a tmp working directory which is writable
-install -d -m0777 %buildroot%{our_path}/usr/share/icecream-envs
+install -d -m0755 %buildroot%{our_path}/usr/share/icecream-envs
 %endif
 
 for binary in $binaries
@@ -182,7 +182,7 @@ exec -a /usr/bin/as %{our_path}/usr/bin/as.real -meabi=5 "$@"
 chmod +x %{buildroot}%{our_path}/usr/bin/as
 
 # allow abuild to do the mv
-chmod 777 %{buildroot}/emul
+chmod 755 %{buildroot}/emul
 
 # make cross ld work with emulated compilers
 mv %{buildroot}%{our_path}/usr/arm-tizen-linux-gnueabi/bin/ld{,.real}
@@ -227,6 +227,13 @@ cp -L /usr/bin/qemu-arm{,-binfmt} %buildroot/qemu/
 
 export NO_BRP_CHECK_RPATH="true"
 
+# Install glibc-locale, otherwise msgmerge >= 0.18.3 fails
+cp -R /usr/lib/{gconv,locale} %{buildroot}%{our_path}/usr/lib
+cp -R /usr/share/locale %{buildroot}%{our_path}/usr/share
+# Fix permissions for abuild
+chmod 755 %{buildroot}%{our_path}/usr/lib/{gconv,locale}
+chmod 755 %{buildroot}%{our_path}/usr/share/locale
+
 %post
 set -x
 if [ $(uname -m) = armv7l ]; then
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index c4f44aa..8b844cb 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -113,7 +113,7 @@ cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
 # And extract it for direct usage
 tar xvz -C %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env} -f /usr/share/icecream-envs/cross-armv7l-gcc48-icecream-backend_*.tar.gz
 # It needs a tmp working directory which is writable
-install -d -m0777 %buildroot%{our_path}/usr/share/icecream-envs
+install -d -m0755 %buildroot%{our_path}/usr/share/icecream-envs
 %endif
 
 for binary in $binaries
@@ -199,7 +199,7 @@ exec -a /usr/bin/as %{our_path}/usr/bin/as.real -meabi=5 "$@"
 chmod +x %{buildroot}%{our_path}/usr/bin/as
 
 # allow abuild to do the mv
-chmod 777 %{buildroot}/emul
+chmod 755 %{buildroot}/emul
 
 # make cross ld work with emulated compilers
 mv %{buildroot}%{our_path}/usr/arm-tizen-linux-gnueabi/bin/ld{,.real}
@@ -245,6 +245,13 @@ cp -L /usr/bin/qemu-arm{,-binfmt} %buildroot/qemu/
 
 export NO_BRP_CHECK_RPATH="true"
 
+# Install glibc-locale, otherwise msgmerge >= 0.18.3 fails
+cp -R /usr/lib/{gconv,locale} %{buildroot}%{our_path}/usr/lib
+cp -R /usr/share/locale %{buildroot}%{our_path}/usr/share
+# Fix permissions for abuild
+chmod 755 %{buildroot}%{our_path}/usr/lib/{gconv,locale}
+chmod 755 %{buildroot}%{our_path}/usr/share/locale
+
 %post
 set -x
 if [ $(uname -m) = armv7l ]; then
diff --git a/packaging/qemu-accel.spec b/packaging/qemu-accel.spec
index 7ba6c71..8604dbc 100644
--- a/packaging/qemu-accel.spec
+++ b/packaging/qemu-accel.spec
@@ -86,7 +86,7 @@ cp -a /usr/share/icecream-envs/%{icecream_cross_env}.tar.gz \
 # And extract it for direct usage
 tar xvz -C %buildroot%{our_path}/usr/share/icecream-envs/%{icecream_cross_env} -f /usr/share/icecream-envs/cross-armv7hl-gcc47-icecream-backend_*.tar.gz
 # It needs a tmp working directory which is writable
-install -d -m0777 %buildroot%{our_path}/usr/share/icecream-envs
+install -d -m0755 %buildroot%{our_path}/usr/share/icecream-envs
 %endif
 
 for binary in $binaries
@@ -163,7 +163,7 @@ exec -a /usr/bin/as %{our_path}/usr/bin/as.real -meabi=5 "$@"
 chmod +x %{buildroot}%{our_path}/usr/bin/as
 
 # allow abuild to do the mv
-chmod 777 %{buildroot}/emul
+chmod 755 %{buildroot}/emul
 
 # make cross ld work with emulated compilers
 mv %{buildroot}%{our_path}/usr/arm-tizen-linux-gnueabi/bin/ld{,.real}
@@ -208,6 +208,13 @@ cp -L /usr/bin/qemu-arm{,-binfmt} %buildroot/qemu/
 
 export NO_BRP_CHECK_RPATH="true"
 
+# Install glibc-locale, otherwise msgmerge >= 0.18.3 fails
+cp -R /usr/lib/{gconv,locale} %{buildroot}%{our_path}/usr/lib
+cp -R /usr/share/locale %{buildroot}%{our_path}/usr/share
+# Fix permissions for abuild
+chmod 755 %{buildroot}%{our_path}/usr/lib/{gconv,locale}
+chmod 755 %{buildroot}%{our_path}/usr/share/locale
+
 %post
 set -x
 if [ $(uname -m) = armv7l ]; then