rpms/squirrelmail/devel squirrelmail-1.4.19-hunspell.patch, NONE, 1.1 squirrelmail.spec, 1.70, 1.71

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.19-hunspell.patch 
Log Message:
use hunspell


squirrelmail-1.4.19-hunspell.patch:

--- NEW FILE squirrelmail-1.4.19-hunspell.patch ---
diff -up squirrelmail-1.4.19/plugins/squirrelspell/sqspell_config.php.hunspell squirrelmail-1.4.19/plugins/squirrelspell/sqspell_config.php
--- squirrelmail-1.4.19/plugins/squirrelspell/sqspell_config.php.hunspell	2009-06-30 12:19:39.340190870 +0200
+++ squirrelmail-1.4.19/plugins/squirrelspell/sqspell_config.php	2009-06-30 12:20:46.363817340 +0200
@@ -20,18 +20,17 @@ sqgetGlobalVar('username', $username, SQ
 /**
  * Example:
  *
- * $SQSPELL_APP = array( 'English' => 'ispell -a',
- *                     'Spanish' => 'ispell -d spanish -a' );
- * You can replace ispell with aspell keeping the same commandline:
+ * $SQSPELL_APP = array( 'English' => 'hunspell -a',
+ *                     'Spanish' => 'hunspell -d spanish -a' );
+ * You can replace hunspell with aspell keeping the same commandline:
  * $SQSPELL_APP = array( 'English' => 'aspell -a',
  *                     'Spanish' => 'aspell -d spanish -a' );
  */
-$SQSPELL_APP = array('English' => 'ispell -a',
-			'Spanish' => 'ispell -d spanish -a');
+$SQSPELL_APP = array('English' => 'hunspell -a');
 $SQSPELL_APP_DEFAULT = 'English';
 $SQSPELL_WORDS_FILE = 
    getHashedFile($username, $data_dir, "$username.words");
 
 $SQSPELL_EREG = 'ereg';
 
-?>
\ No newline at end of file
+?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- squirrelmail.spec	22 May 2009 07:04:35 -0000	1.70
+++ squirrelmail.spec	30 Jun 2009 10:24:27 -0000	1.71
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.19
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -33,10 +33,13 @@ Patch4: squirrelmail-1.4.15-tr-fix.patch
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
 Patch5: squirrelmail-1.4.17-biguid.patch
 
+# bug #508631 - use hunspell instead of aspell
+Patch6: squirrelmail-1.4.19-hunspell.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
-Requires: httpd, php, php-mbstring, perl, tmpwatch, aspell
+Requires: httpd, php, php-mbstring, perl, tmpwatch, hunspell
 Requires: /usr/sbin/sendmail
 
 %description
@@ -59,6 +62,7 @@ tar xfj %SOURCE4
 popd
 
 %patch5 -p1
+#%patch6 -p1
 
 %build
 rm -f plugins/make_archive.pl
@@ -265,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Jun 30 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.19-2
+- use hunspell instead of ispell in squirrelspell plugin (#508631)
+
 * Fri May 22 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.19-1
 - updated to 1.4.19
 - fixes CVE-2009-1381