From 785b27dfeeeb6055af8b6581c247ca1412128dd6 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Dec 20 2016 19:04:43 +0000
Subject: manifest: specify full install-langs list


This is the same change as what was done for the master branch in
https://pagure.io/fedora-atomic/c/5a5eddd?branch=master but for F25. We
can do this now that an rpm-ostree which properly understands
install-langs (https://github.com/projectatomic/rpm-ostree/pull/525) is
in the stable repos.

This is slightly different than what we had before, because we no longer
prune non-UTF8 locales. Since they're minuscule in comparison, I'd say
it's a much nicer benefit to not have to maintain any logic in
treecompose-post.sh.

---

diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json
index af2159a..c93db1d 100644
--- a/fedora-atomic-docker-host.json
+++ b/fedora-atomic-docker-host.json
@@ -12,7 +12,48 @@
 
     "initramfs-args": ["--no-hostonly", "--add", "iscsi"],
 
-    "install-langs": ["en_US"],
+    "install-langs": [
+      "pt_BR",
+      "fr",
+      "fr_FR",
+      "de",
+      "de_DE",
+      "it",
+      "it_IT",
+      "ru",
+      "ru_RU",
+      "es",
+      "es_ES",
+      "en_US",
+      "zh_CN",
+      "ja",
+      "ja_JP",
+      "ko",
+      "ko_KR",
+      "zh_TW",
+      "as",
+      "as_IN",
+      "bn",
+      "bn_IN",
+      "gu",
+      "gu_IN",
+      "hi",
+      "hi_IN",
+      "kn",
+      "kn_IN",
+      "ml",
+      "ml_IN",
+      "mr",
+      "mr_IN",
+      "or",
+      "or_IN",
+      "pa",
+      "pa_IN",
+      "ta",
+      "ta_IN",
+      "te",
+      "te_IN"
+    ],
 
     "postprocess-script": "treecompose-post.sh",
 
diff --git a/treecompose-post.sh b/treecompose-post.sh
index bb51a66..5bb7034 100755
--- a/treecompose-post.sh
+++ b/treecompose-post.sh
@@ -7,22 +7,3 @@ echo 'Storage=persistent' >> /etc/systemd/journald.conf
 
 # Work around https://github.com/systemd/systemd/issues/4082
 find /usr/lib/systemd/system/ -type f -exec sed -i -e '/^PrivateTmp=/d' -e '/^Protect\(Home\|System\)=/d' {} \;
-
-set +x
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
-KEEPLANGS="
-en_US
-"
-# Filter out locales from glibc which aren't UTF-8 and in the above set.
-# TODO: https://github.com/projectatomic/rpm-ostree/issues/526
-localedef --list-archive | while read locale; do
-    lang=${locale%%.*}
-    lang=${lang%%@*}
-    if [[ $locale != *.utf8 ]] || ! grep -q "$lang" <<< "$KEEPLANGS"; then
-        echo "Deleting: $locale"
-        localedef --delete-from-archive "$locale"
-    fi
-done
-set -x
-cp -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-build-locale-archive