Attachment 621475 Details for Bug 858591 – anaconda-18-fix-locales.patch

[patch] anaconda-18-fix-locales.patch

anaconda-18-locales.patch (text/plain), 2.74 KB, created by Jens Petersen on 2012-10-04 09:31:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2012-10-04 09:31:36 UTC

Size: 2.74 KB

patch

obsolete

>diff --git a/anaconda.spec b/anaconda.spec
>index 0456c6c..159c22d 100644
>--- a/anaconda.spec
>+++ b/anaconda.spec
>@@ -3,7 +3,7 @@
> Summary: Graphical system installer
> Name:    anaconda
> Version: 18.12
>-Release: 1%{?dist}
>+Release: 1.1%{?dist}
> License: GPLv2+
> Group:   Applications/System
> URL:     http://fedoraproject.org/wiki/Anaconda
>@@ -14,6 +14,7 @@ URL:     http://fedoraproject.org/wiki/Anaconda
> # ./autogen.sh
> # make dist
> Source0: %{name}-%{version}.tar.bz2
>+Source1: rename-translation-dirs-to-locale-names.sh
> 
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>@@ -237,6 +238,11 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
> %{__rm} -rf %{buildroot}%{_bindir}/liveinst %{buildroot}%{_sbindir}/liveinst
> %endif
> 
>+# rename /usr/share/locale/* to valid locale names (#858591)
>+cd %{buildroot}%{_datadir}/locale
>+sh %SOURCE1
>+cd -
>+
> %find_lang %{name}
> 
> %clean
>@@ -299,6 +305,10 @@ update-desktop-database &> /dev/null || :
> /usr/lib/dracut/modules.d/80%{name}/*
> 
> %changelog
>+* Thu Oct  4 2012 Jens Petersen <petersen@redhat.com> - 18.12-1.1
>+- rename locale/ dirs to locales to workaround invalid locale setting (#858591)
>+  using rename-translation-dirs-to-locale-names.sh
>+
> * Wed Oct 03 2012 Brian C. Lane <bcl@redhat.com> - 18.12-1
> - copy-logs changed names (bcl)
> - Reference correct UI button name (#862409) (jkeating)
>diff --git a/rename-translation-dirs-to-locale-names.sh b/rename-translation-dirs-to-locale-names.sh
>new file mode 100755
>index 0000000..fe7ca1b
>--- /dev/null
>+++ b/rename-translation-dirs-to-locale-names.sh
>@@ -0,0 +1,55 @@
>+#!/bin/sh
>+
>+# first find langs with unique locales in glibc
>+for i in $(ls -d * | grep -v [_@]); do
>+    LOCALE=$(cd /usr/share/i18n/locales; ls ${i}_* | grep -v @)
>+    if [ "$(echo $LOCALE | wc -w)" -eq "1" ]; then
>+	mv $i $LOCALE
>+    fi
>+done
>+
>+# 2 helper functions for locales with variant
>+get_lang() {
>+    echo $1 | sed -e "s/$.*$@.*/\1/"
>+}
>+
>+get_variant() {
>+    echo $1 | sed -e "s/.*@$.*$/\1/"
>+}
>+
>+rename_locale() {
>+    if [ -d "$1" ]; then
>+	case $1 in
>+	    *@*) mv $1 $(get_lang $1)_$2@$(get_variant $1) ;;
>+	    *) 	mv $1 $1_$2 ;;
>+	esac
>+    fi
>+}
>+
>+# these langs have multiple territories
>+rename_locale ar SA
>+rename_locale bn BD
>+rename_locale ca ES
>+rename_locale de DE
>+rename_locale el GR
>+rename_locale es ES
>+rename_locale fr FR
>+rename_locale it IT
>+rename_locale nds DE
>+rename_locale nl NL
>+rename_locale pa IN
>+rename_locale pt PT
>+rename_locale ru RU
>+rename_locale sq AL
>+rename_locale sr RS
>+rename_locale sr@latin RS
>+rename_locale sv SE
>+rename_locale ta IN
>+rename_locale tr TR
>+rename_locale ur PK
>+
>+# locales not yet in glibc
>+rename_locale bal PK
>+rename_locale ilo PH
>+
>+echo "Unconverted locales: $(ls | grep -v _)"

Actions: View | Diff

Attachments on bug 858591: 614238 | 614791 | 614792 | 620140 | 620326 | 620377 | 620776 | 621475 | 621937 | 626612 | 626660 | 626661