rpms/squirrelmail/devel squirrelmail.spec,1.33,1.34

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15040

Modified Files:
	squirrelmail.spec 
Log Message:
Fix Chinese and Korean too



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- squirrelmail.spec	24 Mar 2006 13:16:13 -0000	1.33
+++ squirrelmail.spec	4 Apr 2006 21:53:33 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.6
-Release: 4.fc6
+Release: 5.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -70,7 +70,7 @@
     functions/strings.php
 
 # replace splash screen
-%if %{fedora_splash}
+%if %{fedora_splash} == 1
 cp %{SOURCE2} images/sm_logo.png
 %else
 cp %{SOURCE3} images/sm_logo.png
@@ -84,10 +84,19 @@
     -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \
     -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" 
 
-# Hard-code Japanese to send iso-2022-jp
+# Hard-code Japanese to send iso-2022-jp, UTF-8 is unrealistic
 # Without this, 1.4.6 sends eucjp which is clearly wrong
 sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php
-
+# Hard-code Korean to euc-KR, UTF-8 is unrealistic
+# and not properly handled by squirrelmail
+sed -i s/"$languages\['ko_KR'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ko_KR'\]\['CHARSET'\] = 'euc-KR';"/ functions/i18n.php
+
+# Hard-code Simplified Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_CN'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_CN'\]\['CHARSET'\] = 'gb2312';"/ functions/i18n.php
+sed -i s/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.UTF-8';"/"$languages\['zh_CN'\]\['LOCALE'\] = 'zh_CN.GB2312';"/ functions/i18n.php
+# Hard-code Traditional Chinese charset, UTF-8 is unrealistic
+sed -i s/"$languages\['zh_TW'\]\['CHARSET'\] = 'utf-8';"/"$languages\['zh_TW'\]\['CHARSET'\] = 'big5';"/ functions/i18n.php
+sed -i s/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.UTF-8';"/"$languages\['zh_TW'\]\['LOCALE'\] = 'zh_TW.BIG5';"/ functions/i18n.php
 
 cd locale_tempdir
 for LOCALE in `ls locale/` ; do
@@ -221,6 +230,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Apr 04 2006 Warren Togami <wtogami at redhat.com> 1.4.6-5
+- Fix Chinese and Korean too
+
 * Fri Mar 24 2006 Warren Togami <wtogami at redhat.com> 1.4.6-4
 - Fix outgoing Japanese mail to iso-2022-jp for now (#185767)