diff --git a/.gitignore b/.gitignore index 4c7347d..8485787 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libvisio-0.1.1.tar.xz +SOURCES/libvisio-0.1.6.tar.xz diff --git a/.libvisio.metadata b/.libvisio.metadata index 2555a25..d3de595 100644 --- a/.libvisio.metadata +++ b/.libvisio.metadata @@ -1 +1 @@ -2284866af215a56683bfe4d49a921a053eff4cf9 SOURCES/libvisio-0.1.1.tar.xz +eaf9204fa38a87c8408c03828f6fc9d915d988e0 SOURCES/libvisio-0.1.6.tar.xz diff --git a/SOURCES/0001-add-missing-breaks.patch b/SOURCES/0001-add-missing-breaks.patch deleted file mode 100644 index 81cc687..0000000 --- a/SOURCES/0001-add-missing-breaks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e39b9f080b9cd7ed0e64a43a4c6a053c1dd67718 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 4 May 2015 17:16:50 +0200 -Subject: [PATCH] add missing breaks - -Change-Id: I200b80dca1db001d49fb97326345539c02c66b90 ---- - src/lib/VSDXParser.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp -index f11d778..b8669dd 100644 ---- a/src/lib/VSDXParser.cpp -+++ b/src/lib/VSDXParser.cpp -@@ -1047,6 +1047,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_txtxform = new XForm(); - ret = readDoubleData(m_shape.m_txtxform->angle, reader); - } -+ break; - case XML_BEGINX: - if (XML_READER_TYPE_ELEMENT == tokenType) - { -@@ -1054,6 +1055,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_xform1d = new XForm1D(); - ret = readDoubleData(m_shape.m_xform1d->beginX, reader); - } -+ break; - case XML_BEGINY: - if (XML_READER_TYPE_ELEMENT == tokenType) - { -@@ -1061,6 +1063,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_xform1d = new XForm1D(); - ret = readDoubleData(m_shape.m_xform1d->beginY, reader); - } -+ break; - case XML_ENDX: - if (XML_READER_TYPE_ELEMENT == tokenType) - { -@@ -1068,6 +1071,7 @@ void libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader) - m_shape.m_xform1d = new XForm1D(); - ret = readDoubleData(m_shape.m_xform1d->endX, reader); - } -+ break; - case XML_ENDY: - if (XML_READER_TYPE_ELEMENT == tokenType) - { --- -2.3.5 - diff --git a/SOURCES/0001-define-more-needed-namespaces.patch b/SOURCES/0001-define-more-needed-namespaces.patch deleted file mode 100644 index d4c8b23..0000000 --- a/SOURCES/0001-define-more-needed-namespaces.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 886221dccacd69d7dc7155fa42d3dd902286b846 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 2 Jan 2015 22:21:41 +0100 -Subject: [PATCH] define more needed namespaces - -Change-Id: I83ada29e6bc89d8f045cfbe7c099ca5ec6553645 ---- - src/test/xmldrawinggenerator.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/test/xmldrawinggenerator.cpp b/src/test/xmldrawinggenerator.cpp -index 78484e0..771caff 100644 ---- a/src/test/xmldrawinggenerator.cpp -+++ b/src/test/xmldrawinggenerator.cpp -@@ -33,6 +33,9 @@ void XmlDrawingGenerator::startDocument(const librevenge::RVNGPropertyList &prop - - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:dc"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:meta:1.0")); - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:draw"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0")); -+ xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:fo"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0")); -+ xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:librevenge"), BAD_CAST("urn:x-documentliberation:xmlns:librevenge:0.0")); -+ xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:style"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:style:1.0")); - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:svg"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0")); - xmlTextWriterWriteAttribute(m_writer, BAD_CAST("xmlns:meta"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:meta:1.0")); - --- -2.3.5 - diff --git a/SPECS/libvisio.spec b/SPECS/libvisio.spec index d26431c..54c1da3 100644 --- a/SPECS/libvisio.spec +++ b/SPECS/libvisio.spec @@ -1,8 +1,8 @@ %global apiversion 0.1 Name: libvisio -Version: 0.1.1 -Release: 2%{?dist} +Version: 0.1.6 +Release: 1%{?dist} Summary: A library for import of Microsoft Visio diagrams License: MPLv2.0 @@ -15,18 +15,14 @@ BuildRequires: gperf BuildRequires: help2man BuildRequires: perl BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(zlib) - -Patch0: 0001-add-missing-breaks.patch -Patch1: 0001-define-more-needed-namespaces.patch %description %{name} is library providing ability to interpret and import Microsoft Visio diagrams into various applications. You can find it -being used in libreoffice. +being used in LibreOffice. %package devel Summary: Development files for %{name} @@ -62,20 +58,17 @@ 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 vsd2raw.1 ./src/conv/raw/.libs/vsd2raw -help2man -N -n 'convert Visio document into SVG' -o vsd2xhtml.1 ./src/conv/svg/.libs/vsd2xhtml -help2man -N -n 'convert Visio document into plain text' -o vsd2text.1 ./src/conv/text/.libs/vsd2text -help2man -N -n 'debug the conversion library' -o vss2raw.1 ./src/conv/raw/.libs/vss2raw -help2man -N -n 'convert Visio stencil into SVG' -o vss2xhtml.1 ./src/conv/svg/.libs/vss2xhtml -help2man -N -n 'convert Visio stencil into plain text' -o vss2text.1 ./src/conv/text/.libs/vss2text - %install make install DESTDIR=%{buildroot} rm -f %{buildroot}/%{_libdir}/*.la # rhbz#1001240 we install API docs directly from build rm -rf %{buildroot}/%{_docdir}/%{name} +# generate and install man pages +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +for tool in vsd2raw vss2text vsd2xhtml vss2raw vsd2text vss2xhtml; do + help2man -N -S '%{name} %{version}' -o ${tool}.1 %{buildroot}%{_bindir}/${tool} +done install -m 0755 -d %{buildroot}/%{_mandir}/man1 install -m 0644 vsd2*.1 vss2*.1 %{buildroot}/%{_mandir}/man1 @@ -84,12 +77,11 @@ install -m 0644 vsd2*.1 vss2*.1 %{buildroot}/%{_mandir}/man1 %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -# Workaround time formatting problem in the test -export TZ='CET' make check %{?_smp_mflags} %files -%doc AUTHORS COPYING.* +%doc AUTHORS README NEWS +%license COPYING.* %{_libdir}/%{name}-%{apiversion}.so.* %files devel @@ -99,7 +91,7 @@ make check %{?_smp_mflags} %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc %files doc -%doc COPYING.* +%license COPYING.* %doc docs/doxygen/html %files tools @@ -117,6 +109,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/vss2xhtml.1* %changelog +* Sat Oct 21 2017 David Tardon - 0.1.6-1 +- Resolves: rhbz#1477219 rebase to 0.1.6 + * Mon May 04 2015 David Tardon - 0.1.1-2 - Related: rhbz#1207761 include some upstream fixes