From 16c86a63f11613555638511055752d367dbdd0c8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 12 Sep 2017 21:34:07 +0200 Subject: [PATCH] new upstream release 0.10.2 --- .gitignore | 1 + libwpd-tdf112269.patch | 42 ------------------------------------------ libwpd.spec | 10 ++++++---- sources | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 libwpd-tdf112269.patch diff --git a/.gitignore b/.gitignore index 0d423f7..b8ff913 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libwpd-0.9.9.tar.xz /libwpd-0.10.0.tar.xz /libwpd-0.10.1.tar.xz +/libwpd-0.10.2.tar.xz diff --git a/libwpd-tdf112269.patch b/libwpd-tdf112269.patch deleted file mode 100644 index bc79ab0..0000000 --- a/libwpd-tdf112269.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- libwpd/src/lib/WP5StylesListener.cpp -+++ libwpd/src/lib/WP5StylesListener.cpp -@@ -85,8 +85,9 @@ - m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); - m_currentPage.setPageSpan(1); - -- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); -- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) -+ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); -+ for (std::vector::const_iterator HFiter = headerFooterList.begin(); -+ HFiter != headerFooterList.end(); ++HFiter) - { - if ((*HFiter).getOccurrence() != NEVER) - { ---- libwpd/src/lib/WP42StylesListener.cpp -+++ libwpd/src/lib/WP42StylesListener.cpp -@@ -84,8 +84,9 @@ - m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); - m_currentPage.setPageSpan(1); - -- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); -- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) -+ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); -+ for (std::vector::const_iterator HFiter = headerFooterList.begin(); -+ HFiter != headerFooterList.end(); ++HFiter) - { - if ((*HFiter).getOccurrence() != NEVER) - { ---- libwpd/src/lib/WP1StylesListener.cpp -+++ libwpd/src/lib/WP1StylesListener.cpp -@@ -83,8 +83,9 @@ - m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); - m_currentPage.setPageSpan(1); - -- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); -- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) -+ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); -+ for (std::vector::const_iterator HFiter = headerFooterList.begin(); -+ HFiter != headerFooterList.end(); ++HFiter) - { - if ((*HFiter).getOccurrence() != NEVER) - { diff --git a/libwpd.spec b/libwpd.spec index 07a1364..1392fe2 100644 --- a/libwpd.spec +++ b/libwpd.spec @@ -2,19 +2,18 @@ Name: libwpd Summary: A library for import of WordPerfect documents -Version: 0.10.1 -Release: 8%{?dist} +Version: 0.10.2 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz URL: http://libwpd.sf.net/ License: LGPLv2+ or MPLv2.0 +BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: help2man BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(zlib) -Patch0: libwpd-tdf112269.patch - %description %{name} is a library for import of WordPerfect documents. @@ -92,6 +91,9 @@ install -m 0644 wpd2*.1 %{buildroot}/%{_mandir}/man1 %doc docs/%{name}.png %changelog +* Tue Sep 12 2017 David Tardon - 0.10.2-1 +- new upstream release + * Thu Sep 07 2017 Caolán McNamara - 0.10.1-8 - Related: rhbz#1489337 extend to earlier file format version diff --git a/sources b/sources index 7abc7d4..b47b138 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e98574901f8019a239947c1d8c34b69 libwpd-0.10.1.tar.xz +SHA512 (libwpd-0.10.2.tar.xz) = 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79