rpms/abiword/FC-3 abiword-2.0.12.libwpd.patch,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/abiword/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv27123

Modified Files:
	abiword-2.0.12.libwpd.patch 
Log Message:
tum te tum

abiword-2.0.12.libwpd.patch:
 abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp | 1061 +++++-----
 abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.h   |  128 -
 abiword-2.0.12/abi/ac-helpers/abi-plugins.m4                                          |    2 
 abiword-2.0.12/abi/configure                                                          |   16 
 abiword-2.0.12/abiword-plugins/acinclude.m4                                           |    4 
 abiword-2.0.12/abiword-plugins/aclocal.m4                                             |    4 
 abiword-2.0.12/abiword-plugins/configure                                              |   16 
 abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4                        |    8 
 8 files changed, 643 insertions(+), 596 deletions(-)

Index: abiword-2.0.12.libwpd.patch
===================================================================
RCS file: /cvs/dist/rpms/abiword/FC-3/abiword-2.0.12.libwpd.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- abiword-2.0.12.libwpd.patch	17 Oct 2005 12:10:48 -0000	1.6
+++ abiword-2.0.12.libwpd.patch	17 Oct 2005 12:16:31 -0000	1.7
@@ -143,20 +143,6 @@
  	abi_plugin_disable=yes
  ])
  if test $abi_plugin_disable = no; then
---- abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4.orig	2005-10-17 05:14:59.000000000 -0400
-+++ abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4	2005-10-17 05:17:07.000000000 -0400
-@@ -27,9 +27,9 @@
- # Checks for libraries.
- # Checks for header fils.
- 
--PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.7.0,[
- 	ABI_PLUGIN_REPORT([WordPerfect: okay])
--],[	ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-1 >= 0.7.0 required])
-+],[	ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-0.8 >= 0.7.0 required])
- 	abi_plugin_disable=yes
- ])
- if test $abi_plugin_disable = no; then
 diff -ruN abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp
 --- abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp	2004-06-25 15:24:46.000000000 +0100
 +++ abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/xp/ie_imp_WordPerfect.cpp	2005-10-17 12:39:38.000000000 +0100
@@ -1746,9 +1732,17 @@
  	
  	
  	// HACK HACK HACK
---- abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4      2005-10-17 12:40:51.000000000 +0100
-+++ abiword-2.0.12.hacked/abiword-plugins/wp/impexp/wordperfect/plugin.m4       2005-10-17 13:09:48.000000000 +0100
-@@ -33,8 +33,8 @@
+--- abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4.orig      2005-10-17 13:14:38.000000000 +0100
++++ abiword-2.0.12/abiword-plugins/wp/impexp/wordperfect/plugin.m4       2005-10-17 13:09:48.000000000 +0100
+@@ -27,14 +27,14 @@
+ # Checks for libraries.
+ # Checks for header fils.
+
+-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
++PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.7.0,[
+        ABI_PLUGIN_REPORT([WordPerfect: okay])
+-],[    ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-1 >= 0.7.0 required])
++],[    ABI_PLUGIN_REPORT([WordPerfect: error - libwpd-0.8 >= 0.7.0 required])
         abi_plugin_disable=yes
  ])
  if test $abi_plugin_disable = no; then