[writerperfect] fix libe-book integration

[David Tardon]

commit aff3364d6ce620de5c9e8f926d9ada28014de521
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 29 13:42:22 2014 +0200

    fix libe-book integration

 ...-fix-supported-format-check-for-libe-book.patch |   25 ++++++++++++++++++++
 0002-fix-return-value.patch                        |   25 ++++++++++++++++++++
 writerperfect.spec                                 |    8 +++++-
 3 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/0001-fix-supported-format-check-for-libe-book.patch b/0001-fix-supported-format-check-for-libe-book.patch
new file mode 100644
index 0000000..eeaf114
--- /dev/null
+++ b/0001-fix-supported-format-check-for-libe-book.patch
@@ -0,0 +1,25 @@
+From bf7c4573ab8b566667fc6757c2c5204068405e14 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 29 May 2014 12:18:34 +0200
+Subject: [PATCH 1/2] fix supported format check for libe-book
+
+---
+ src/ebook2odt.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ebook2odt.cxx b/src/ebook2odt.cxx
+index a005e38..e13e8e9 100644
+--- a/src/ebook2odt.cxx
++++ b/src/ebook2odt.cxx
+@@ -87,7 +87,7 @@ public:
+ 	}
+ 	bool isSupportedFormat(librevenge::RVNGInputStream &input)
+ 	{
+-		return libebook::EBOOKDocument::isSupported(&input);
++		return libebook::EBOOKDocument::CONFIDENCE_EXCELLENT == libebook::EBOOKDocument::isSupported(&input);
+ 	}
+ };
+ 
+-- 
+1.9.3
+
diff --git a/0002-fix-return-value.patch b/0002-fix-return-value.patch
new file mode 100644
index 0000000..5477b2a
--- /dev/null
+++ b/0002-fix-return-value.patch
@@ -0,0 +1,25 @@
+From 1586f8212e0f8d632dfacf59ecc1ab115a3945d7 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 29 May 2014 12:33:01 +0200
+Subject: [PATCH 2/2] fix return value
+
+---
+ src/ebook2odt.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ebook2odt.cxx b/src/ebook2odt.cxx
+index e13e8e9..6a7d0af 100644
+--- a/src/ebook2odt.cxx
++++ b/src/ebook2odt.cxx
+@@ -55,7 +55,7 @@ public:
+ 		}
+ 		try
+ 		{
+-			if (!libebook::EBOOKDocument::parse(&input, &collector))
++			if (libebook::EBOOKDocument::RESULT_OK != libebook::EBOOKDocument::parse(&input, &collector))
+ 				return false;
+ 		}
+ 		catch (...)
+-- 
+1.9.3
+
diff --git a/writerperfect.spec b/writerperfect.spec
index 2ef0067..47f5291 100644
--- a/writerperfect.spec
+++ b/writerperfect.spec
@@ -1,6 +1,6 @@
 Name: writerperfect
 Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tools to transform various file formats into ODF
 
 Group: Applications/Publishing
@@ -26,6 +26,9 @@ BuildRequires: pkgconfig(libwpd-0.10)
 BuildRequires: pkgconfig(libwpg-0.3)
 BuildRequires: pkgconfig(libwps-0.3)
 
+Patch0: 0001-fix-supported-format-check-for-libe-book.patch
+Patch1: 0002-fix-return-value.patch
+
 %description
 Tools to transform various file formats into ODF.
 
@@ -105,6 +108,9 @@ install -m 0644 *od?.1 %{buildroot}/%{_mandir}/man1
 %{_mandir}/man1/wps2odt.1*
 
 %changelog
+* Thu May 29 2014 David Tardon <dtardon at redhat.com> - 0.9.0-2
+- fix libe-book integration
+
 * Mon May 26 2014 David Tardon <dtardon at redhat.com> - 0.9.0-1
 - new upstream release