From b1d60faabef21bdc1b7ec58d775ea9b84ec33e46 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Jun 06 2015 17:30:46 +0000
Subject: fix libwp? detection


---

diff --git a/abiword-3.0.0-libwp.patch b/abiword-3.0.0-libwp.patch
new file mode 100644
index 0000000..9f269bd
--- /dev/null
+++ b/abiword-3.0.0-libwp.patch
@@ -0,0 +1,36 @@
+From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 6 Jun 2015 18:43:14 +0200
+Subject: [PATCH] fix libwp? detection
+
+---
+ plugin-configure.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugin-configure.m4 b/plugin-configure.m4
+index 54998fb..92e4ec2 100644
+--- a/plugin-configure.m4
++++ b/plugin-configure.m4
+@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
+ AC_SUBST([BMP_LIBS])
+ 
+ 
+-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
++wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
+ AC_SUBST([AIKSAURUS_LIBS])
+ 
+ 
+-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
++wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.3'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+-- 
+2.4.2
+
diff --git a/abiword.spec b/abiword.spec
index 9682b84..daa6890 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -23,6 +23,7 @@ Patch2: abiword-2.6.0-boolean.patch
 Patch3: abiword-3.0.0-librevenge.patch
 Patch4: abiword-3.0.0-link-grammar-5.patch
 Patch5: abiword-3.0.0-link-grammar-5-second.patch
+Patch6: abiword-3.0.0-libwp.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -110,17 +111,19 @@ Python bindings for developing with libabiword
 %patch3 -p0 -b .librevenge
 %patch4 -p1 -b .link-grammar-5
 %patch5 -p1 -b .link-grammar-5-second
+%patch6 -p1 -b .libwp
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
 %patch0 -p1 -b .windowshelppaths
 
 %build
+# build libabiword and abiword
+cd $RPM_BUILD_DIR/abiword-%{version}
+
 aclocal
 autoconf
 
-# build libabiword and abiword
-cd $RPM_BUILD_DIR/abiword-%{version}
 %configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
 # Build non SMP due to issues with gobject-introspection builds
 # make %{?_smp_mflags} V=1