clean up, add platforms, correct dependencies, use external expat and xml libs, patch flawed libole2 buildconf, and... upgrading package: abiword 2.2.2 -> 2.2.3

abiword/abiword.patch

@@ -34,3 +34,64 @@ Index: pngerror.c
     }
  }
  
+Index: wv/configure.ac
+--- wv/configure.ac.orig	2004-11-30 02:10:14 +0100
++++ wv/configure.ac	2005-01-13 15:12:22 +0100
+@@ -77,7 +77,7 @@
+ dnl AC_TYPE_SIGNAL
+ dnl AC_FUNC_WAIT3
+ 
+-AC_CHECK_HEADERS(fcntl.h io.h malloc.h sys/file.h sys/ioctl.h unistd.h)
++AC_CHECK_HEADERS(fcntl.h io.h malloc.h sys/file.h sys/ioctl.h sys/types.h unistd.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ 
+Index: wv/configure
+--- wv/configure.orig	2004-11-30 02:10:13 +0100
++++ wv/configure	2005-01-13 15:12:33 +0100
+@@ -1262,7 +1262,7 @@
+ fi
+ 
+ 
+-for ac_hdr in fcntl.h io.h malloc.h sys/file.h sys/ioctl.h unistd.h
++for ac_hdr in fcntl.h io.h malloc.h sys/file.h sys/ioctl.h sys/types.h unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+Index: wv/libole2/ms-ole.h
+--- wv/libole2/ms-ole.h.orig	2005-01-13 15:14:57 +0100
++++ wv/libole2/ms-ole.h	2005-01-13 15:17:01 +0100
+@@ -11,24 +11,26 @@
+ #ifndef MS_OLE_H
+ #define MS_OLE_H
+ 
++/* #include <libole2-config.h> */
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+ /* This should be done in glib */
+ #if !defined(_WIN32) || defined(__CYGWIN__)
+-#if defined(__QNXNTO__)
+-# include <sys/types.h>	
+-#endif
+-# include <fcntl.h>       /* for mode_t */
+-#else
+-# include <stdlib.h>
+-#if defined(__MINGW32__) || defined(__WINE__)
++#if defined HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #else
+ 	typedef unsigned long mode_t;
+ 	typedef long off_t;
+ #endif
++# include <fcntl.h>       /* for mode_t */
++#else
++# include <stdlib.h>
+ #ifndef _SSIZE_T_
+ 	typedef size_t ssize_t;
+ #endif

abiword/abiword.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Editor
 License:      GPL
-Version:      2.2.2
-Release:      20041215
+Version:      2.2.3
+Release:      20050113
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/abiword/abiword-%{version}.tar.gz
@@ -53,9 +53,14 @@ Patch0:       abiword.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, fontconfig, pkgconfig, fribidi, xft
-BuildPreReq:  glib2, glib2::with_threads = yes, libiconv, libglade, zlib, popt, png
-PreReq:       OpenPKG, openpkg >= 20040130, fontconfig
+BuildPreReq:  OpenPKG, openpkg >= 20040130, pkgconfig
+BuildPreReq:  glib2, glib2::with_threads = yes, expat
+BuildPreReq:  fontconfig, fribidi, jpeg, libiconv
+BuildPreReq:  libglade, popt, png, xft, libxml, zlib
+PreReq:       OpenPKG, openpkg >= 20040130
+PreReq:       glib2, glib2::with_threads = yes, expat
+PreReq:       fontconfig, fribidi, jpeg, libiconv
+PreReq:       libglade, popt, png, xft, libxml, zlib
 AutoReq:      no
 AutoReqProv:  no
 
@@ -80,22 +85,22 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
-    case "%{l_platform -t}" in
-        sun4*-* )
+    case "%{l_platform -c}" in
+        hppa*-* | ppc*-* | sparc*-* )
             %setup -q -T -D -a 2
             %setup -q -T -D -a 4
             %setup -q -T -D -a 6
             %setup -q -T -D -a 8
             %setup -q -T -D -a 10
             ;;
-        *86*-* )
+        alpha*-* | amd64-* | ia64-* | ix86-* )
             %setup -q -T -D -a 1
             %setup -q -T -D -a 3
             %setup -q -T -D -a 5
             %setup -q -T -D -a 7
             %setup -q -T -D -a 9
             ;;
-        * ) echo "Only SPARC and ix86 architectures are supported" 2>&1
+        * ) echo "Only HPPA, PowerPC, SPARC, Alpha, AMD, ia64, and ix86 architectures are supported" 2>&1
             exit 1
             ;;
     esac
@@ -115,10 +120,6 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;\(AP_PREF_DEFAULT_SpellDirectory.*\)dictionary;\1abiword/dictionary;' \
         abi/src/wp/ap/xp/ap_Prefs_SchemeIds.h
-    %{l_shtool} subst \
-        -e 's;\(\/dictionary\/\);/abiword\1;' \
-        abi/src/other/spell/xp/barbarisms.cpp \
-        abi/src/other/spell/xp/ispell_checker.cpp
     %{l_shtool} subst \
         -e 's;\(/templates/\);/abiword\1;' \
         abi/src/text/ptbl/xp/pd_Document.cpp \
@@ -150,7 +151,7 @@ AutoReqProv:  no
         abi/src/wp/ap/win/ap_Win32Dialog_Background.cpp \
         abi/src/wp/ap/xp/ap_EditMethods.cpp
     %{l_shtool} subst \
-        -e 's;/@PACKAGE@;;' \
+        -e 's;\/@PACKAGE@;;' \
         `find . -name "GNUmakefile.in" -print`
 
 %build
@@ -185,13 +186,16 @@ AutoReqProv:  no
         --disable-gnome \
         --disable-shared \
         --enable-extra-optimization \
-        --with-zlib=%{l_prefix} \
-        --with-libpng=%{l_prefix} \
+        --with-expat=%{l_prefix} \
+        --with-libjpeg-prefix=%{l_prefix} \
         --with-libiconv=%{l_prefix} \
-        --with-libxml2=%{l_prefix} \
+        --with-libpng=%{l_prefix} \
         --with-popt=%{l_prefix} \
-        --with-pspell=no \
-        --with-libjpeg-prefix=%{l_prefix}
+        --with-zlib=%{l_prefix} \
+        --with-pspell=no
+
+    #   ensure that no undesired embedded software is built
+    rm -rf expat fribidi libiconv libpng popt zlib
 
     #   build the program
     %{l_make} %{l_mflags}