diff --git a/.gitignore b/.gitignore index 64974ea..f1ba2c6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /writerperfect-0.8.3.tar.xz /writerperfect-0.8.4.tar.xz /writerperfect-0.9.0.tar.xz +/writerperfect-0.9.1.tar.xz diff --git a/0001-fix-supported-format-check-for-libe-book.patch b/0001-fix-supported-format-check-for-libe-book.patch deleted file mode 100644 index eeaf114..0000000 --- a/0001-fix-supported-format-check-for-libe-book.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bf7c4573ab8b566667fc6757c2c5204068405e14 Mon Sep 17 00:00:00 2001 -From: David Tardon -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 deleted file mode 100644 index 5477b2a..0000000 --- a/0002-fix-return-value.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1586f8212e0f8d632dfacf59ecc1ab115a3945d7 Mon Sep 17 00:00:00 2001 -From: David Tardon -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/sources b/sources index 5966093..8ef8368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e22f15f92902fbc227e99475852ee3a6 writerperfect-0.9.0.tar.xz +a6c624072e662e721382f9af1d818e74 writerperfect-0.9.1.tar.xz diff --git a/writerperfect.spec b/writerperfect.spec index 47f5291..7048f4a 100644 --- a/writerperfect.spec +++ b/writerperfect.spec @@ -1,6 +1,6 @@ Name: writerperfect -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Tools to transform various file formats into ODF Group: Applications/Publishing @@ -26,9 +26,6 @@ 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. @@ -108,6 +105,9 @@ install -m 0644 *od?.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/wps2odt.1* %changelog +* Tue Jun 03 2014 David Tardon - 0.9.1-1 +- new upstream release + * Thu May 29 2014 David Tardon - 0.9.0-2 - fix libe-book integration