rpms/squirrelmail/F-10 squirrelmail-1.4.17-highlight.patch, NONE, 1.1 squirrelmail.spec, 1.61, 1.62

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13956

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.17-highlight.patch 
Log Message:
don't use white text (invisible on white paper) for highlighting in conf.pl


squirrelmail-1.4.17-highlight.patch:

--- NEW FILE squirrelmail-1.4.17-highlight.patch ---
--- branches/SM-1_4-STABLE/squirrelmail/config/conf.pl	2008/12/05 21:05:48	13365
+++ branches/SM-1_4-STABLE/squirrelmail/config/conf.pl	2009/03/17 21:23:46	13436
@@ -396,7 +396,7 @@
 
 #####################################################################################
 if ( $config_use_color == 1 ) {
-    $WHT = "\x1B[37;1m";
+    $WHT = "\x1B[1m";
     $NRM = "\x1B[0m";
 } else {
     $WHT              = "";
@@ -681,7 +681,7 @@
             $NRM              = "";
         } else {
             $config_use_color = 1;
-            $WHT              = "\x1B[37;1m";
+            $WHT              = "\x1B[1m";
             $NRM              = "\x1B[0m";
         }
     } elsif ( $command eq "d" && $menu == 0 ) {


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-10/squirrelmail.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- squirrelmail.spec	17 Mar 2009 11:11:23 -0000	1.61
+++ squirrelmail.spec	18 Mar 2009 08:41:46 -0000	1.62
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -20,6 +20,10 @@
 Patch2:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
 
+# from upstream, for squirrelmail <= 1.4.17, bug #427217
+# don't use white for highlighting = invisible for some color schemas
+Patch4: squirrelmail-1.4.17-highlight.patch
+
 # Taken from upstream
 Patch10:  squirrelmail-1.4.15-tr-fix.patch
 
@@ -43,6 +47,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p3
 
 mkdir locale_tempdir
 cd locale_tempdir
@@ -78,9 +83,6 @@
 	 -e "s|__PREFSDIR__|%{_localstatedir}/lib/squirrelmail/prefs/|g;" $f
 done
 
-#dont use colors in config by default, rhbz#427217
-sed -i 's|$config_use_color = 1;|$config_use_color = 0;|' contrib/RPM/config.php.redhat
-
 # Fix the version
 %{__perl} -pi -e "s|^(\s*\\\$version\s*=\s*'[^']+)'|\1-%{release}'|g"\
     functions/strings.php
@@ -251,6 +253,10 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Mar 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.17-4
+- don't use white text (invisible on white paper) for highlighting
+  in conf.pl (#427217)
+
 * Tue Mar 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.17-3
 - dont use colors in conf.pl by default (#427217)