upgrading package: abiword 2.0.2 -> 2.1.0

abiword/abiword.patch

@@ -0,0 +1,20 @@
+Index: abi/src/af/util/xp/ut_iconv.cpp
+--- abi/src/af/util/xp/ut_iconv.cpp.orig	2003-12-28 12:24:14.000000000 +0100
++++ abi/src/af/util/xp/ut_iconv.cpp	2003-12-28 12:31:24.000000000 +0100
+@@ -49,6 +49,7 @@
+ 
+ /************************************************************************/
+ /************************************************************************/
++A
+ 
+ /* UGLY UGLY Iconv hack for operating systems with strange declartions
+    for iconv.  Why, oh why can't they all be the same? <sob> I will
+@@ -67,7 +68,7 @@
+ #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
+ (defined (__MACH__) && defined (__APPLE__)) || \
+ (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
+-defined(__BEOS__) || defined (__AIX__) || \
++defined(__BEOS__) || defined (__AIX__) || defined(__FreeBSD__) || \
+ (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
+ 
+ #define ICONV_CONST const

abiword/abiword.spec

@@ -24,8 +24,8 @@
 ##
 
 #   package version
-%define       V_opkg 2.0.2
-%define       V_dist 2.0.2
+%define       V_opkg 2.1.0
+%define       V_dist 2.1.0
 
 #   package information
 Name:         abiword
@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Editor
 License:      GPL
 Version:      %{V_opkg}
-Release:      20031211
+Release:      20031228
 
 #   list of sources
 Source0:      http://download.sourceforge.net/sourceforge/abiword/abiword-%{V_dist}.tar.gz
@@ -51,6 +51,7 @@ Source7:      http://download.sourceforge.net/sourceforge/abiword/abispell-en-GB
 Source8:      http://download.sourceforge.net/sourceforge/abiword/abispell-en-GB.ppc.tar.gz
 Source9:      http://download.sourceforge.net/sourceforge/abiword/abispell-en-US.i386.tar.gz
 Source10:     http://download.sourceforge.net/sourceforge/abiword/abispell-en-US.ppc.tar.gz
+Patch0:       abiword.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -74,6 +75,7 @@ AutoReqProv:  no
 
 %prep
     %setup0 -q -n abiword-%{V_dist}
+    %patch0 -p0
     case "%{l_platform -t}" in
         sparc*-* )
             %setup2  -q -n abiword-%{V_dist} -T -D -a 2
@@ -93,10 +95,6 @@ AutoReqProv:  no
             exit 1
             ;;
     esac
-    %{l_shtool} subst \
-        -e 's;^\( *ICONV_CONST char\);//\1;' \
-        -e 's;\( *return iconv( cd, \);\1in;' \
-        abi/src/af/util/xp/ut_iconv.cpp
     %{l_shtool} subst \
         -e 's;^\(ABIWORD_APP_NAME=\)"AbiWord";\1"abiword";' \
         -e 's;^\(ABIWORD_APP_LIBDIR=\)"AbiWord";\1"abiword";' \
@@ -145,9 +143,6 @@ AutoReqProv:  no
         abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp \
         abi/src/wp/ap/win/ap_Win32Dialog_Background.cpp \
         abi/src/wp/ap/xp/ap_EditMethods.cpp
-    %{l_shtool} subst \
-        -e 's;\(docdir.*share/\)AbiSuite-2.0/AbiWord/help;\1abiword/help;' \
-        abiword-docs/Makefile
     %{l_shtool} subst \
         -e 's;/@PACKAGE@;;' \
         abi/src/af/ev/qnx/GNUmakefile.in \