diff --git a/0001-fix-test.patch b/0001-fix-test.patch deleted file mode 100644 index 3ad232d..0000000 --- a/0001-fix-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 25 Jul 2015 15:11:19 +0200 -Subject: [PATCH] fix test - -The previous version only worked with libxml2 < 2.9.2, because of a bug -in handling nested elements of the same name. - -Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f ---- - configure.ac | 4 ++++ - src/test/importtest.cpp | 6 +++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp -index 8554309..0296380 100644 ---- a/src/test/importtest.cpp -+++ b/src/test/importtest.cpp -@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme() - void ImportTest::testVsdxCharBgColor() - { - m_doc = parse("bgcolor.vsdx", m_buffer); -- assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color"); -- assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); -- assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); -+ assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color"); -+ assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); -+ assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61"); - } - - CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest); --- -2.1.0 - diff --git a/libvisio-0.1.3.tar.xz b/libvisio-0.1.3.tar.xz deleted file mode 100644 index 0c5a5c4..0000000 --- a/libvisio-0.1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8 -size 479592 diff --git a/libvisio-0.1.4.tar.xz b/libvisio-0.1.4.tar.xz new file mode 100644 index 0000000..7897e9b --- /dev/null +++ b/libvisio-0.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c1b1b34382aaeb6dad8077d0bfb153cad7de6229ce59c99e6523a88ffd01038 +size 502940 diff --git a/libvisio.changes b/libvisio.changes index 00a1be4..004bd6d 100644 --- a/libvisio.changes +++ b/libvisio.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Dec 24 09:30:28 UTC 2015 - fstrba@suse.com + +- Version bump to 0.1.4 + * Layer properties + * Bullets + * Tab-sets + * Hatch fills + * A lot of bug-fixes +- Removed patch: + * 0001-fix-test.patch + - Integrated upstream +- Remove CPPFLAGS used to build with boost 1.59.0 + * Fixed upstream + ------------------------------------------------------------------- Wed Nov 11 11:13:54 UTC 2015 - idonmez@suse.com diff --git a/libvisio.spec b/libvisio.spec index d046bfc..bd5f266 100644 --- a/libvisio.spec +++ b/libvisio.spec @@ -18,14 +18,13 @@ %define libname libvisio-0_1-1 Name: libvisio -Version: 0.1.3 +Version: 0.1.4 Release: 0 Summary: Library for parsing the MS Visio file format structure License: MPL-2.0 Group: Productivity/Publishing/Word Url: http://www.freedesktop.org/wiki/Software/libvisio Source0: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz -Patch0: 0001-fix-test.patch BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: doxygen @@ -82,14 +81,9 @@ This package contains tools to work with documents in MS Visio file-format. %prep %setup -q -%if 0%{?suse_version} > 1320 -%patch0 -p1 -%endif %build export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" -# Fix compilation with boost 1.59 -export CPPFLAGS="-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" %configure \ --disable-werror \ --disable-static \