diff --git a/liborcus-0.7.0-gcc-5.3.patch b/liborcus-0.7.0-gcc-5.3.patch new file mode 100644 index 0000000..aba44e2 --- /dev/null +++ b/liborcus-0.7.0-gcc-5.3.patch @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -14842,7 +14842,7 @@ else + #include + boost-lib-version = BOOST_LIB_VERSION + _ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++if (eval "$ac_cpp -P conftest.$ac_ext") 2>&5 | + tr -d '\r' | + $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then : + boost_cv_lib_version=`cat conftest.i` +--- a/m4/boost.m4 ++++ b/m4/boost.m4 +@@ -71,7 +71,7 @@ dnl strip `\n' with backquotes, not the + dnl boost_cv_lib_version='1_37\r' for instance, which breaks + dnl everything else. + dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK +-(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | ++(eval "$ac_cpp -P conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + tr -d '\r' | + $SED -n -e "$1" >conftest.i 2>&1], + [$3], diff --git a/liborcus-0.7.0-libboost-1.56.patch b/liborcus-0.7.0-libboost-1.56.patch new file mode 100644 index 0000000..f72d66b --- /dev/null +++ b/liborcus-0.7.0-libboost-1.56.patch @@ -0,0 +1,25 @@ +From c01874c7770f4f56c031d7463156e03f2945e015 Mon Sep 17 00:00:00 2001 +From: Dmitry Roshchin +Date: Mon, 27 Oct 2014 16:19:32 +0300 +Subject: [PATCH] Fix build with boost 1.56 + +--- + src/parser/string_pool_test.cpp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/parser/string_pool_test.cpp b/src/parser/string_pool_test.cpp +index ad7d7c8..0d32c62 100644 +--- a/src/parser/string_pool_test.cpp ++++ b/src/parser/string_pool_test.cpp +@@ -5,6 +5,8 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + ++#include ++ + #include "orcus/string_pool.hpp" + #include "orcus/pstring.hpp" + +-- +1.7.1 + diff --git a/liborcus.spec b/liborcus.spec index d833b87..97997cb 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -1,5 +1,5 @@ Name: liborcus -Version: 0.7.0 +Version: 0.9.2 Release: 1mamba Summary: Standalone file import filter library for spreadsheet documents Group: System/Libraries @@ -7,12 +7,14 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://gitorious.org/orcus -Source: http://kohei.us/files/orcus/src/liborcus-%{version}.tar.bz2 +Source: http://kohei.us/files/orcus/src/liborcus-%{version}.tar.xz #Source: http://dev-www.libreoffice.org/src/ea2acaf140ae40a87a952caa75184f4d-liborcus-%{version}.tar.bz2 #Source: git://gitorious.org/orcus/orcus.git/master/orcus-%{version}.tar.bz2 Patch0: liborcus-0.3.0-libboost-1.52.patch Patch1: liborcus-0.5.1-libmdds-0.8.patch Patch2: liborcus-0.5.1-libboost-1.54.patch +Patch3: liborcus-0.7.0-libboost-1.56.patch +Patch4: liborcus-0.7.0-gcc-5.3.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -22,7 +24,7 @@ BuildRequires: libixion-devel BuildRequires: libstdc++6-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: libixion-devel >= 0.7 +BuildRequires: libixion-devel >= 0.9.1-2mamba BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -53,6 +55,8 @@ This package contains utility applications for %{name}. %patch0 -p1 #%patch1 -p1 %patch2 -p1 +#%patch3 -p1 +#%patch4 -p1 %build ./autogen.sh @@ -86,10 +90,11 @@ This package contains utility applications for %{name}. %{_libdir}/liborcus-*.la %{_libdir}/liborcus-*.so %{_libdir}/pkgconfig/liborcus-*.pc -%doc NEWS README +%doc NEWS %files tools %defattr(-,root,root) +%{_bindir}/orcus-css-dump %{_bindir}/orcus-csv %{_bindir}/orcus-detect %{_bindir}/orcus-gnumeric @@ -103,6 +108,9 @@ This package contains utility applications for %{name}. %{_bindir}/orcus-zip-dump %changelog +* Sun Jan 24 2016 Silvan Calarco 0.9.2-1mamba +- update to 0.9.2 + * Sun Jul 27 2014 Silvan Calarco 0.7.0-1mamba - update to 0.7.0