From c5ad73f81dfd99571d873070e1e882addd040193 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Wed, 2 Nov 2011 14:24:07 +0100
Subject: [PATCH] makedist.sh: fix removal of unused locales (fixes espanol
 release); some obsolete comments cleanup

---
 makedist.inc.sh | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index d3f7f35..7a12e9c 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -111,28 +111,17 @@ ONBOOT=yes
 _EOF
 fi
 
-#   erase_rpm_database
+#erase_rpm_database
 clean_rpm_database
 
-echo "Deleting unneeded files..."
 # delete unused localizations
 #
-find $MOUNTDIR/usr/share/locale \
- -maxdepth 1 -mindepth 1 -type d \
-! -name it* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \;
-
-#$CHROOTCMD chkconfig --add acpid ||
-#   { echo "$mkcd_me: fatal error, aborting installation" >&2
-#      { (exit 1); exit 1; }; }
-
-# configure extlinux boot loader
-#cat > $MOUNTDIR/boot/extlinux.conf << _EOF
-#DEFAULT $PLATFORM
-#LABEL $PLATFORM
-#KERNEL /boot/vmlinuz-${KERNEL_VER}${KERNEL_EXTRAVER}
-#APPEND video=vesafb:1280x1024-32 root=$ROOTDEV console=tty1
-#resume2=swap:$SWAPDEV
-#_EOF
+echo "Deleting other languages l10n files..."
+for d in /usr/share/locale /opt/kde/share/locale \
+         /opt/kde/share/locale/l10n /opt/kde3/share/locale; do
+   find ${MOUNTDIR}${d} -maxdepth 1 -mindepth 1 -type d \
+      ! -name ${LANGUAGE}* ! -name en* ! -name C ! -name l10n -exec rm -rf {} \; 2>/dev/null
+done
 
 if [ "$U_BOOT" ]; then
 echo "Copying u-boot Image for Kernel"
@@ -148,10 +137,6 @@ if [ ${MULTITHREAD:-0} -gt 0 ]; then
    sed -i "s|multithread=1|multithread=0|" $MOUNTDIR/etc/sysconfig/rc
 fi
 
-# blacklist buggy ehci_hcd
-#echo "blacklist ehci_hcd" > $MOUNTDIR/etc/modprobe.conf.d/ehci_hcd
-
-
 # set rootdev on extlinux
 [ -e $MOUNTDIR/boot/extlinux.conf ] && sed -i "s|\([^::alpha]root=\)[^ ]*|\1$ROOTDEV|" $MOUNTDIR/boot/extlinux.conf