diff --git a/.gitignore b/.gitignore index 0208a97..a22575f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libmwaw-0.1.7.tar.bz2 /libmwaw-0.1.8.tar.bz2 +/libmwaw-0.1.9.tar.xz diff --git a/0001-use-cast-for-conv.-from-shared_ptr-to-bool.patch b/0001-use-cast-for-conv.-from-shared_ptr-to-bool.patch deleted file mode 100644 index 9fad51d..0000000 --- a/0001-use-cast-for-conv.-from-shared_ptr-to-bool.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 33be1b4f0f60e91a0ad3d945e13a056a6dc8b9ab Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 27 Apr 2013 16:12:47 +0200 -Subject: [PATCH] use cast for conv. from shared_ptr to bool - -... because std::shared_ptr<>::operator bool is explicit in C++11. ---- - src/lib/MWAWInputStream.cxx | 2 +- - src/lib/MWAWInputStream.hxx | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/lib/MWAWInputStream.cxx b/src/lib/MWAWInputStream.cxx -index 0220f02..5c0bfff 100644 ---- a/src/lib/MWAWInputStream.cxx -+++ b/src/lib/MWAWInputStream.cxx -@@ -583,7 +583,7 @@ bool MWAWInputStream::createStorageOLE() - m_storageOLE.reset(new libmwawOLE::Storage(m_stream)); - seek(actPos, WPX_SEEK_SET); - -- return m_storageOLE; -+ return bool(m_storageOLE); - } - - //////////////////////////////////////////////////////////// -diff --git a/src/lib/MWAWInputStream.hxx b/src/lib/MWAWInputStream.hxx -index ecdc66c..25a5396 100644 ---- a/src/lib/MWAWInputStream.hxx -+++ b/src/lib/MWAWInputStream.hxx -@@ -170,11 +170,11 @@ public: - - /** returns true if the data fork block exists */ - bool hasDataFork() const { -- return m_stream; -+ return bool(m_stream); - } - /** returns true if the resource fork block exists */ - bool hasResourceFork() const { -- return m_resourceFork; -+ return bool(m_resourceFork); - } - /** returns the resource fork if find */ - shared_ptr getResourceForkStream() { --- -1.8.1.4 - diff --git a/libmwaw.spec b/libmwaw.spec index a5084b6..e7f0157 100644 --- a/libmwaw.spec +++ b/libmwaw.spec @@ -1,7 +1,7 @@ %global apiversion 0.1 Name: libmwaw -Version: 0.1.8 +Version: 0.1.9 Release: 1%{?dist} Summary: Import library for some old mac text documents @@ -12,13 +12,11 @@ Group: System Environment/Libraries # it is used for. License: (LGPLv2+ or MPLv2.0) and BSD URL: http://sourceforge.net/projects/libmwaw/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz BuildRequires: doxygen BuildRequires: libwpd-devel -Patch0: 0001-use-cast-for-conv.-from-shared_ptr-to-bool.patch - %description libmwaw contains some import filters for old mac text documents (MacWrite, ClarisWorks, ... ) based on top of the libwpd (which is @@ -54,7 +52,6 @@ Supported output formats are XHTML, text and raw. %prep %setup -q -%patch0 -p1 %build @@ -104,6 +101,9 @@ rm -f %{buildroot}/%{_bindir}/mwawFile %changelog +* Tue May 14 2013 David Tardon - 0.1.9-1 +- new release + * Tue Apr 30 2013 David Tardon - 0.1.8-1 - new upstream release diff --git a/sources b/sources index 862181a..4acba01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7515f94bce7d8685561132ef858828b3 libmwaw-0.1.8.tar.bz2 +13ea6b1812b3a91541fd572fd7015390 libmwaw-0.1.9.tar.xz