rpms/abiword/FC-3 abiword-2.0.12.libwpd.patch,1.3,1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 17 09:35:40 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/abiword/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv19618
Modified Files:
abiword-2.0.12.libwpd.patch
Log Message:
try 2
abiword-2.0.12.libwpd.patch:
abi/ac-helpers/abi-plugins.m4 | 2 +-
abi/configure | 16 ++++++++--------
abiword-plugins/acinclude.m4 | 4 ++--
abiword-plugins/aclocal.m4 | 4 ++--
abiword-plugins/configure | 16 ++++++++--------
abiword-plugins/wp/impexp/wordperfect/plugin.m4 | 4 ++--
6 files changed, 23 insertions(+), 23 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- abiword-2.0.12.libwpd.patch 17 Oct 2005 09:19:19 -0000 1.3
+++ abiword-2.0.12.libwpd.patch 17 Oct 2005 09:35:37 -0000 1.4
@@ -6,7 +6,7 @@
wordperfect)
_abi_plugin_lib=AbiWordPerfect
- PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.5.0)
-+ PKG_CHECK_MODULES(_abi_wordperfect,libwpd >= 0.5.0)
++ PKG_CHECK_MODULES(_abi_wordperfect,libwpd-0.8 >= 0.5.0)
PLUGIN_LIBS="$PLUGIN_LIBS $_abi_wordperfect_LIBS"
;;
xhtml)
@@ -23,7 +23,7 @@
+echo $ECHO_N "checking for libwpd >= 0.5.0... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libwpd-1 >= 0.5.0" ; then
-+ if $PKG_CONFIG --exists "libwpd >= 0.5.0" ; then
++ if $PKG_CONFIG --exists "libwpd-0.8 >= 0.5.0" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
@@ -31,14 +31,14 @@
echo "$as_me:$LINENO: checking _abi_wordperfect_CFLAGS" >&5
echo $ECHO_N "checking _abi_wordperfect_CFLAGS... $ECHO_C" >&6
- _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-1 >= 0.5.0"`
-+ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd >= 0.5.0"`
++ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 >= 0.5.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_CFLAGS" >&5
echo "${ECHO_T}$_abi_wordperfect_CFLAGS" >&6
echo "$as_me:$LINENO: checking _abi_wordperfect_LIBS" >&5
echo $ECHO_N "checking _abi_wordperfect_LIBS... $ECHO_C" >&6
- _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-1 >= 0.5.0"`
-+ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd >= 0.5.0"`
++ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 >= 0.5.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_LIBS" >&5
echo "${ECHO_T}$_abi_wordperfect_LIBS" >&6
else
@@ -47,7 +47,7 @@
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-1 >= 0.5.0"`
-+ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd >= 0.5.0"`
++ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-0.8 >= 0.5.0"`
echo $_abi_wordperfect_PKG_ERRORS
fi
@@ -70,10 +70,10 @@
# Checks for header fils.
-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd >= 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.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
@@ -90,7 +90,7 @@
+echo $ECHO_N "checking for libwpd >= 0.7.0... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libwpd-1 >= 0.7.0" ; then
-+ if $PKG_CONFIG --exists "libwpd >= 0.7.0" ; then
++ if $PKG_CONFIG --exists "libwpd-0.8 >= 0.7.0" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
@@ -98,14 +98,14 @@
echo "$as_me:$LINENO: checking _abi_wordperfect_CFLAGS" >&5
echo $ECHO_N "checking _abi_wordperfect_CFLAGS... $ECHO_C" >&6
- _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-1 >= 0.7.0"`
-+ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd >= 0.7.0"`
++ _abi_wordperfect_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 >= 0.7.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_CFLAGS" >&5
echo "${ECHO_T}$_abi_wordperfect_CFLAGS" >&6
echo "$as_me:$LINENO: checking _abi_wordperfect_LIBS" >&5
echo $ECHO_N "checking _abi_wordperfect_LIBS... $ECHO_C" >&6
- _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-1 >= 0.7.0"`
-+ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd >= 0.7.0"`
++ _abi_wordperfect_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 >= 0.7.0"`
echo "$as_me:$LINENO: result: $_abi_wordperfect_LIBS" >&5
echo "${ECHO_T}$_abi_wordperfect_LIBS" >&6
else
@@ -114,7 +114,7 @@
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-1 >= 0.7.0"`
-+ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd >= 0.7.0"`
++ _abi_wordperfect_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwpd-0.8 >= 0.7.0"`
fi
@@ -136,10 +136,10 @@
# Checks for header fils.
-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd >= 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.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
@@ -150,10 +150,10 @@
# Checks for header fils.
-PKG_CHECK_MODULES(_abi_wordperfect,libwpd-1 >= 0.7.0,[
-+PKG_CHECK_MODULES(_abi_wordperfect,libwpd >= 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.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
More information about the fedora-cvs-commits
mailing list