From d173ff63e47e78e48e0a841b1f8936f60136364b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Nov 20 2017 10:09:13 +0000 Subject: new upstream release 0.13.1 --- diff --git a/.gitignore b/.gitignore index 5d662ce..712a1f2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /liborcus-0.11.1.tar.xz /liborcus-0.11.2.tar.xz /liborcus-0.12.1.tar.xz +/liborcus-0.13.1.tar.xz diff --git a/0001-Wtautological-compare-compare-against-the-other-para.patch b/0001-Wtautological-compare-compare-against-the-other-para.patch deleted file mode 100644 index 8a95948..0000000 --- a/0001-Wtautological-compare-compare-against-the-other-para.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9fc5c84f0e5ba6266df3057c80af8279e03b7c04 Mon Sep 17 00:00:00 2001 -From: Markus Mohrhard -Date: Mon, 19 Sep 2016 21:04:02 +0200 -Subject: [PATCH] -Wtautological-compare, compare against the 'other' parameter - ---- - src/parser/json_parser_thread.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/parser/json_parser_thread.cpp b/src/parser/json_parser_thread.cpp -index 6f4dd2d3..5e3515e8 100644 ---- a/src/parser/json_parser_thread.cpp -+++ b/src/parser/json_parser_thread.cpp -@@ -77,7 +77,7 @@ bool parse_token::operator== (const parse_token& other) const - case parse_token_t::parse_error: - if (pstring(error_value.p, error_value.len) != pstring(other.error_value.p, other.error_value.len)) - return false; -- if (error_value.offset != error_value.offset) -+ if (error_value.offset != other.error_value.offset) - return false; - break; - default: --- -2.14.1 - diff --git a/liborcus.spec b/liborcus.spec index 25fc9fc..8b81915 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -1,4 +1,4 @@ -%global apiversion 0.12 +%global apiversion 0.13 # build conversion tools %bcond_without convtools @@ -6,8 +6,8 @@ %bcond_without python Name: liborcus -Version: 0.12.1 -Release: 7%{?dist} +Version: 0.13.1 +Release: 1%{?dist} Summary: Standalone file import filter library for spreadsheet documents License: MPLv2.0 @@ -18,7 +18,7 @@ BuildRequires: boost-devel BuildRequires: doxygen %if %{with convtools} BuildRequires: help2man -BuildRequires: pkgconfig(libixion-0.12) +BuildRequires: pkgconfig(libixion-0.13) %endif BuildRequires: pkgconfig(mdds-1.2) %if %{with python} @@ -26,8 +26,6 @@ BuildRequires: pkgconfig(python3) %endif BuildRequires: pkgconfig(zlib) -Patch0: 0001-Wtautological-compare-compare-against-the-other-para.patch - %description %{name} is a standalone file import filter library for spreadsheet documents. Currently under development are ODS, XLSX and CSV import @@ -161,6 +159,7 @@ make check %{?_smp_mflags} %{_bindir}/orcus-csv %{_bindir}/orcus-gnumeric %{_bindir}/orcus-ods +%{_bindir}/orcus-styles-ods %{_bindir}/orcus-xls-xml %{_bindir}/orcus-xlsx %{_bindir}/orcus-xml @@ -184,6 +183,9 @@ make check %{?_smp_mflags} %doc doc/_doxygen/html %changelog +* Mon Nov 20 2017 David Tardon - 0.13.1-1 +- new upstream release + * Thu Aug 03 2017 Fedora Release Engineering - 0.12.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index bd21c3b..3f22deb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14d39b4ba7e44123d63b7a1d1358026a liborcus-0.12.1.tar.xz +SHA512 (liborcus-0.13.1.tar.xz) = 1c81332974cada2d3526e86ef564211100fb765b611a2239fe6aaabb8666e38a7c8cb52696e5d7c402794ea5b5ceb23b083f7adf2c4417d2e635007d9baa4420