rpms/squirrelmail/F-10 squirrelmail.spec,1.60,1.61

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	squirrelmail.spec 
Log Message:
dont use colors in conf.pl by default (#427217)



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-10/squirrelmail.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- squirrelmail.spec	4 Dec 2008 12:02:03 -0000	1.60
+++ squirrelmail.spec	17 Mar 2009 11:11:23 -0000	1.61
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.17
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -17,17 +17,11 @@
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.13-20071220.tar.bz2
 Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
-#Patch2:  squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
-Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
-Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
-#Patch5:  squirrelmail-1.4.7-ja-translate.patch
-#Patch6:  squirrelmail-1.4.9a-id_plural.patch
+Patch2:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+
 # Taken from upstream
-Patch7:  squirrelmail-1.4.15-tr-fix.patch
-# CVE-2006-6142
-#Patch100:  squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch
-#Patch101:  squirrelmail-1.4.8-CVE-2006-6142-mailto.patch
-#Patch102:  squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch
+Patch10:  squirrelmail-1.4.15-tr-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -47,20 +41,13 @@
 %prep
 %setup -q -n squirrelmail-%{version}
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
-%patch4 -p1
-
-# CVE-2006-6142
-#%patch100 -p0
-#%patch101 -p0
-#%patch102 -p1
 
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
-#%patch6 -p2
-%patch7 -p2
+%patch10 -p2
 
 %build
 rm -f plugins/make_archive.pl
@@ -91,6 +78,9 @@
 	 -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
@@ -261,6 +251,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Mar 17 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.17-3
+- dont use colors in conf.pl by default (#427217)
+
 * Thu Dec 04 2008 Michal Hlavinka <mhalvink at redhat.com> - 1.4.17-2
 - add missing locales