From bc80fa2faae38c78cff4490a7d2e8e8b35867a31 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Jan 2018 09:26:01 +0100 Subject: [PATCH] new upstream release 0.1.2 --- .gitignore | 1 + ...259904-dereference-before-null-check.patch | 30 --------------- ...5-do-not-let-AbiDocument-parse-throw.patch | 38 ------------------- libabw.spec | 28 +++++++------- sources | 2 +- 5 files changed, 17 insertions(+), 82 deletions(-) delete mode 100644 0001-coverity-1259904-dereference-before-null-check.patch delete mode 100644 0001-coverity-1259905-do-not-let-AbiDocument-parse-throw.patch diff --git a/.gitignore b/.gitignore index 54f9a35..996af42 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libabw-0.0.2.tar.xz /libabw-0.1.0.tar.xz /libabw-0.1.1.tar.xz +/libabw-0.1.2.tar.xz diff --git a/0001-coverity-1259904-dereference-before-null-check.patch b/0001-coverity-1259904-dereference-before-null-check.patch deleted file mode 100644 index 3ddc9a9..0000000 --- a/0001-coverity-1259904-dereference-before-null-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a65eb81c5e9d9da0548eb9066f9dde77a7328cc3 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 20 Dec 2014 18:35:36 +0100 -Subject: [PATCH] coverity#1259904 dereference before null check - -Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e ---- - src/lib/ABWParser.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp -index cf914bf..426ab54 100644 ---- a/src/lib/ABWParser.cpp -+++ b/src/lib/ABWParser.cpp -@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader) - void libabw::ABWParser::readM(xmlTextReaderPtr reader) - { - xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key")); -- m_state->m_currentMetadataKey = reinterpret_cast(key); - if (key) -+ { -+ m_state->m_currentMetadataKey = reinterpret_cast(key); - xmlFree(key); -+ } - } - - void libabw::ABWParser::readHistory(xmlTextReaderPtr reader) --- -2.3.5 - diff --git a/0001-coverity-1259905-do-not-let-AbiDocument-parse-throw.patch b/0001-coverity-1259905-do-not-let-AbiDocument-parse-throw.patch deleted file mode 100644 index 656bee9..0000000 --- a/0001-coverity-1259905-do-not-let-AbiDocument-parse-throw.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2f372e8adf8e6b1f8cf70f08adddcf66be54d94a Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 20 Dec 2014 18:40:45 +0100 -Subject: [PATCH] coverity#1259905 do not let AbiDocument::parse throw - -This also fixes coverity#1259906 and coverity#1259907 . - -Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790 ---- - src/lib/AbiDocument.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp -index b8ab661..23ff750 100644 ---- a/src/lib/AbiDocument.cpp -+++ b/src/lib/AbiDocument.cpp -@@ -110,7 +110,7 @@ is not protected - \return A value that indicates whether the conversion was successful and in case it - was not, it indicates the reason of the error - */ --ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) -+ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try - { - ABW_DEBUG_MSG(("AbiDocument::parse\n")); - if (!input) -@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre - return true; - return false; - } -+catch (...) -+{ -+ return false; -+} -+ - /* vim:set shiftwidth=2 softtabstop=2 expandtab: */ --- -2.3.5 - diff --git a/libabw.spec b/libabw.spec index 6dc6de0..8117698 100644 --- a/libabw.spec +++ b/libabw.spec @@ -1,8 +1,8 @@ %global apiversion 0.1 Name: libabw -Version: 0.1.1 -Release: 16%{?dist} +Version: 0.1.2 +Release: 1%{?dist} Summary: A library for import of AbiWord files License: MPLv2.0 @@ -13,11 +13,12 @@ BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: gperf BuildRequires: help2man +BuildRequires: perl-interpreter BuildRequires: pkgconfig(librevenge-0.0) +BuildRequires: pkgconfig(librevenge-generators-0.0) +BuildRequires: pkgconfig(librevenge-stream-0.0) BuildRequires: pkgconfig(libxml-2.0) - -Patch0: 0001-coverity-1259904-dereference-before-null-check.patch -Patch1: 0001-coverity-1259905-do-not-let-AbiDocument-parse-throw.patch +BuildRequires: pkgconfig(zlib) %description %{name} is a library for import of AbiWord files. @@ -49,8 +50,6 @@ supported: XHTML, raw, text. %autosetup -p1 %build -# rhbz#1258125 fix build with boost 1.59 -export CPPFLAGS='-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED' %configure --disable-silent-rules --disable-static --disable-werror sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ @@ -58,18 +57,18 @@ sed -i \ libtool make %{?_smp_mflags} -export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -help2man -N -n 'debug the conversion library' -o abw2raw.1 ./src/conv/raw/.libs/abw2raw -help2man -N -n 'convert AbiWord document into HTML' -o abw2html.1 ./src/conv/html/.libs/abw2html -help2man -N -n 'convert AbiWord document into plain text' -o abw2text.1 ./src/conv/text/.libs/abw2text - %install make install DESTDIR=%{buildroot} rm -f %{buildroot}/%{_libdir}/*.la # we install API docs directly from build rm -rf %{buildroot}/%{_docdir}/%{name} -mkdir -p %{buildroot}/%{_mandir}/man1 +# generate and install man pages + export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + for tool in abw2html abw2raw abw2text; do + help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} + done +install -m 0755 -d %{buildroot}/%{_mandir}/man1 install -m 0644 abw2*.1 %{buildroot}/%{_mandir}/man1 %post -p /sbin/ldconfig @@ -100,6 +99,9 @@ install -m 0644 abw2*.1 %{buildroot}/%{_mandir}/man1 %{_mandir}/man1/abw2html.1* %changelog +* Tue Jan 02 2018 David Tardon - 0.1.2-1 +- new upstream release + * Thu Aug 03 2017 Fedora Release Engineering - 0.1.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 650080a..43eddb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6be55a46078b593ec20cad9bb8730c3e libabw-0.1.1.tar.xz +SHA512 (libabw-0.1.2.tar.xz) = a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd