[arch-commits] Commit in glibc/trunk (PKGBUILD locale.gen.txt)

[Frederik Schwan]

    Date: Tuesday, September 6, 2022 @ 12:39:58
  Author: freswa
Revision: 455119

improve locale handling as supposed by @codefiles

Add SUPPORTED file to package as done by other distributions in order to provide
the set of available locales in a unmodified file.
Also remove examples in locale.gen to avoid matches of tools as sed and grep.

Credit @ https://github.com/archlinux/archinstall/pull/1423#issuecomment-1236515008

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/locale.gen.txt

----------------+
 PKGBUILD       |    3 +++
 locale.gen.txt |    6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-06 12:32:45 UTC (rev 455118)
+++ PKGBUILD	2022-09-06 12:39:58 UTC (rev 455119)
@@ -185,6 +185,9 @@
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
     "$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen"
 
+  # Add SUPPORTED file
+  install -dm644 "$srcdir"/glibc/localedata/SUPPORTED "$pkgdir"/usr/share/i18n/SUPPORTED
+
   # install C.UTF-8 so that it is always available
   install -dm755 "$pkgdir/usr/lib/locale"
   cp -r "$srcdir/C.UTF-8" -t "$pkgdir/usr/lib/locale"

Modified: locale.gen.txt
===================================================================
--- locale.gen.txt	2022-09-06 12:32:45 UTC (rev 455118)
+++ locale.gen.txt	2022-09-06 12:39:58 UTC (rev 455119)
@@ -9,12 +9,6 @@
 #  where <locale> is one of the locales given in /usr/share/i18n/locales
 #  and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
 #
-#  Examples:
-#  en_US ISO-8859-1
-#  en_US.UTF-8 UTF-8
-#  de_DE ISO-8859-1
-#  de_DE at euro ISO-8859-15
-#
 #  The locale-gen command will generate all the locales,
 #  placing them in /usr/lib/locale.
 #