rpms/squirrelmail/devel squirrelmail-1.4.17-highlight.patch, NONE, 1.1 squirrelmail.spec, 1.64, 1.65

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9551

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.17-highlight.patch 
Log Message:
don't use white color in conf.pl for highlighting


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/devel/squirrelmail.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- squirrelmail.spec	17 Mar 2009 11:24:02 -0000	1.64
+++ squirrelmail.spec	18 Mar 2009 08:27:06 -0000	1.65
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -18,20 +18,24 @@
 Source5: config_local.php
 
 # bug #196017
-Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
+Patch1: squirrelmail-1.4.6-zenkaku-subject-convert.patch
 
 # bug #195452
-Patch2:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+Patch2: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 
 # bug #194457
-Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+Patch3: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
 
 # Taken from upstream - translation with this fix is not released yet
-Patch4:  squirrelmail-1.4.15-tr-fix.patch
+Patch4: squirrelmail-1.4.15-tr-fix.patch
 
 # bug #450780 - sent upstream, available here:
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
-Patch5:  squirrelmail-1.4.17-biguid.patch
+Patch5: squirrelmail-1.4.17-biguid.patch
+
+# from upstream, for squirrelmail <= 1.4.17, bug #427217
+# don't use white for highlighting = invisible for some color schemas
+Patch6: squirrelmail-1.4.17-highlight.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -88,9 +92,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
@@ -269,6 +270,10 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Mar 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.17-6
+- 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-5
 - don't use colored conf.pl by default (#427217)