rpms/alpine/devel alpine-2.00-hunspell.patch, NONE, 1.1 alpine.spec, 1.18, 1.19

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/alpine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24769

Modified Files:
	alpine.spec 
Added Files:
	alpine-2.00-hunspell.patch 
Log Message:
* Thu Jul 02 2009 Caolán McNamara <caolanm at redhat.com> - 2.00-6
- --with-spellcheck-prog isn't a configure option use
  --with-simple-spellcheck/--with-interactive-spellcheck and patch
  to prefer hunspell to aspell (#509387)


alpine-2.00-hunspell.patch:

--- NEW FILE alpine-2.00-hunspell.patch ---
diff -ru alpine-2.00.orig/configure.ac alpine-2.00/configure.ac
--- alpine-2.00.orig/configure.ac	2009-06-28 16:52:14.000000000 +0100
+++ alpine-2.00/configure.ac	2009-07-02 15:22:43.000000000 +0100
@@ -361,29 +361,36 @@
       fi
     ],
     [
-      SPELLPROG=yes
+      AC_CHECK_PROG([SPELLPROG], [hunspell], [hunspell], [])
+      if test -z "$SPELLPROG" ; then
+        AC_CHECK_PROG([SPELLPROG], [aspell], [aspell], [])
+        if test -z "$SPELLPROG" ; then
+          AC_CHECK_PROG([SPELLPROG], [ispell], [ispell], [])
+          if test -z "$SPELLPROG" ; then
+           SPELLPROG="spell"
+          fi
+        fi
+      fi
     ])
 
-case "$SPELLPROG" in
-  no)
-    ;;
-  yes)
-    AC_PATH_PROG(alpine_simple_spellcheck, [aspell])
-    if test -n "$alpine_simple_spellcheck" ; then
-      alpine_simple_spellcheck="$alpine_simple_spellcheck --dont-backup --mode=email list"
-    else
-      AC_PATH_PROG(alpine_simple_spellcheck, [ispell])
-      if test -n "$alpine_simple_spellcheck" ; then
+if test "x$SPELLPROG" != "xno" ; then
+  AC_PATH_PROG(alpine_simple_spellcheck, $SPELLPROG)
+  if test -n "$alpine_simple_spellcheck" ; then
+    case "$SPELLPROG" in
+      hunspell)
         alpine_simple_spellcheck="$alpine_simple_spellcheck -l"
-      else
-        AC_PATH_PROG(alpine_simple_spellcheck, [spell])
-      fi
-    fi
-    ;;
-  *)
-    AC_PATH_PROG(alpine_simple_spellcheck, $SPELLPROG)
-    ;;
-esac
+        ;;
+      aspell)
+        alpine_simple_spellcheck="$alpine_simple_spellcheck --dont-backup --mode=email list"
+        ;;
+      ispell)
+        alpine_simple_spellcheck="$alpine_simple_spellcheck -l"
+        ;;
+      *)
+        ;;
+    esac
+  fi
+fi
 
 dnl OPTION: interactive spell checking program
 AC_ARG_WITH(interactive-spellcheck,
@@ -394,24 +401,27 @@
       fi
     ],
     [
-      ISPELLPROG=yes
+      AC_CHECK_PROG([ISPELLPROG], [hunspell], [hunspell], [])
+      if test -z "$ISPELLPROG" ; then
+        AC_CHECK_PROG([ISPELLPROG], [aspell], [aspell], [])
+        if test -z "$SPELLPROG" ; then
+          ISPELLPROG="ispell"
+        fi
+      fi
     ])
 
-case "$ISPELLPROG" in
-  no)
-    ;;
-  yes)
-    AC_PATH_PROG(alpine_interactive_spellcheck, [aspell])
-    if test -n "$alpine_interactive_spellcheck" ; then
-      alpine_interactive_spellcheck="$alpine_interactive_spellcheck --dont-backup --mode=email check"
-    else
-      AC_PATH_PROG(alpine_interactive_spellcheck, [ispell])
-    fi
-    ;;
-  *)
-    AC_PATH_PROG(alpine_interactive_spellcheck, $withval)
-    ;;
-esac
+if test "x$ISPELLPROG" != "xno" ; then
+  AC_PATH_PROG(alpine_interactive_spellcheck, $ISPELLPROG)
+  if test -n "$alpine_interactive_spellcheck" ; then
+    case "$ISPELLPROG" in
+      aspell)
+        alpine_interactive_spellcheck="$alpine_interactive_spellcheck --dont-backup --mode=email check"
+        ;;
+      *)
+        ;;
+    esac
+  fi
+fi
 
 if test -z "$alpine_simple_spellcheck" -a -n "$alpine_interactive_spellcheck" ; then
   alpine_simple_spellcheck=test


Index: alpine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alpine/devel/alpine.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- alpine.spec	6 May 2009 13:44:26 -0000	1.18
+++ alpine.spec	6 Jul 2009 16:46:46 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: powerful, easy to use console email client
 Name: alpine
 Version: 2.00 
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: ASL 2.0
 Group: Applications/Internet
@@ -29,9 +29,11 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 # short-term workaround until gcc is fixed
 # http://bugzilla.redhat.com/496400
 Patch1: alpine-2.00-gcc44_reply_hack.patch
+Patch2: alpine-2.00-hunspell.patch
 
-BuildRequires: aspell
+BuildRequires: automake libtool
 BuildRequires: gettext
+BuildRequires: hunspell
 BuildRequires: inews
 BuildRequires: krb5-devel
 BuildRequires: ncurses-devel 
@@ -41,7 +43,7 @@ BuildRequires: pam-devel
 BuildRequires: passwd
 BuildRequires: sendmail /usr/sbin/sendmail
 
-Requires: aspell
+Requires: hunspell
 Requires: mailcap
 Requires: /usr/sbin/sendmail
 
@@ -70,6 +72,11 @@ GNU Build System's autotools.
 #if 0%{?fedora} > 10
 %patch1 -p1 -b .gcc44_reply_hack
 #endif
+%patch2 -p1 -b .hunspell
+
+# HACK to workaround local auto* wierdness outside of mock
+export AUTOPOINT=/bin/true
+autoreconf -f -i
 
 
 %build
@@ -80,7 +87,8 @@ touch imap/ip6
   --without-tcl \
   --with-c-client-target=lfd \
   --with-passfile=.alpine.passfile \
-  --with-spellcheck-prog=aspell \
+  --with-simple-spellcheck=hunspell \
+  --with-interactive-spellcheck=hunspell \
   --with-system-pinerc=%{_sysconfdir}/pine.conf \
   --with-system-fixed-pinerc=%{_sysconfdir}/pine.conf.fixed
 
@@ -119,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 02 2009 Caolán McNamara <caolanm at redhat.com> - 2.00-6
+- --with-spellcheck-prog isn't a configure option use
+  --with-simple-spellcheck/--with-interactive-spellcheck and patch
+  to prefer hunspell to aspell (#509387)
+
 * Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.00-5
 - "reply to all recipients" doesn't include anyone on the Cc list (#496400)