Hello community, here is the log from the commit of package liborcus for openSUSE:Factory checked in at 2013-08-02 14:44:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liborcus (Old) and /work/SRC/openSUSE:Factory/.liborcus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liborcus" Changes: -------- --- /work/SRC/openSUSE:Factory/liborcus/liborcus.changes 2013-06-17 10:09:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liborcus.new/liborcus.changes 2013-08-02 14:44:37.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Aug 1 09:27:39 UTC 2013 - tchva...@suse.com + +- Version bump to 0.5.1: + * More fixes around streaming + * Various boost fixes + * Improvements required for libreoffice-4.1. +- Use full download url for tarball +- Drop libzip-devel requirement +- Add patch for new mdds liborcus-0.5.1-mdds.patch +- Add patch for SLE11 gcc liborcus-0.5.1-oldnamespace.patch +- Add patch for newest boost liborcus-0.5.1-linking.patch +- Drop deprecated patch boost-configure.patch + +------------------------------------------------------------------- Old: ---- boost-configure.patch liborcus_0.3.0.tar.bz2 New: ---- liborcus-0.5.1-linking.patch liborcus-0.5.1-mdds.patch liborcus-0.5.1-oldnamespace.patch liborcus-0.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liborcus.spec ++++++ --- /var/tmp/diff_new_pack.OXCQwl/_old 2013-08-02 14:44:38.000000000 +0200 +++ /var/tmp/diff_new_pack.OXCQwl/_new 2013-08-02 14:44:38.000000000 +0200 @@ -16,27 +16,31 @@ # -%define libname liborcus-0_4-0 +%define libname liborcus-0_6-0 Name: liborcus -Version: 0.3.0 +Version: 0.5.1 Release: 0 Summary: Spreadsheet file processing library License: MIT Group: Productivity/Publishing/Word Url: http://gitorious.org/orcus -Source: %{name}_%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM boost-configure.patch sch...@suse.de -- AX_BOOST_BASE: add aarch64 to the list of lib64 architectures -Patch: boost-configure.patch +Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.bz2 +# Taken from git to build with newest mdds +Patch0: liborcus-0.5.1-mdds.patch +# Give this patch to kohei to include in git +Patch1: liborcus-0.5.1-oldnamespace.patch +# Taken from git to build with newer boost +Patch2: liborcus-0.5.1-linking.patch BuildRequires: autoconf >= 2.63 BuildRequires: automake BuildRequires: boost-devel BuildRequires: coreutils BuildRequires: gcc-c++ +BuildRequires: libixion-devel >= 0.5.0 BuildRequires: libstdc++-devel BuildRequires: libtool -BuildRequires: libzip-devel -BuildRequires: mdds-devel >= 0.5.4 +BuildRequires: mdds-devel >= 0.7.1 BuildRequires: pkg-config BuildRequires: python-xml BuildRequires: zlib-devel @@ -57,7 +61,6 @@ Summary: Spreadsheet file processing library Group: Development/Libraries/C and C++ Requires: %libname = %version -Requires: libzip-devel Requires: zlib-devel %description devel @@ -74,15 +77,10 @@ %prep -%setup -q -n %{name}_%version -%patch -p1 - -sed -i \ - -e 's:<ostream>:<ostream>\n#include <boost/utility.hpp>:' \ - include/orcus/dom_tree.hpp -sed -i \ - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \ - configure.ac +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build autoreconf -i @@ -90,7 +88,6 @@ --disable-static \ --disable-debug \ --disable-werror \ - --disable-spreadsheet-model \ --docdir=%_docdir/%name make %{?_smp_mflags} ++++++ liborcus-0.5.1-linking.patch ++++++ diff -urN liborcus-0.5.1/src/parser/Makefile.am liborcus-0.5.1.new/src/parser/Makefile.am --- liborcus-0.5.1/src/parser/Makefile.am 2013-04-12 16:25:03.000000000 +0200 +++ liborcus-0.5.1.new/src/parser/Makefile.am 2013-04-23 19:45:47.794480191 +0200 @@ -20,7 +20,8 @@ liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \ - $(ZLIB_LIBS) + $(BOOST_SYSTEM_LIB) \ + $(ZLIB_LIBS) EXTRA_PROGRAMS = \ parser-test-string-pool \ ++++++ liborcus-0.5.1-mdds.patch ++++++ diff -urN liborcus-0.5.1.old/src/spreadsheet/sheet.cpp liborcus-0.5.1/src/spreadsheet/sheet.cpp --- liborcus-0.5.1.old/src/spreadsheet/sheet.cpp 2013-05-27 19:07:41.712302036 +0200 +++ liborcus-0.5.1/src/spreadsheet/sheet.cpp 2013-05-27 19:08:51.432302028 +0200 @@ -734,7 +734,7 @@ con.build_tree(); size_t index; - if (!con.search_tree(col, index)) + if (!con.search_tree(col, index).second) return 0; return index; ++++++ liborcus-0.5.1-oldnamespace.patch ++++++ diff -urN liborcus-0.5.1.old/src/orcus_xml_main.cpp liborcus-0.5.1/src/orcus_xml_main.cpp --- liborcus-0.5.1.old/src/orcus_xml_main.cpp 2013-05-27 19:07:41.713302036 +0200 +++ liborcus-0.5.1/src/orcus_xml_main.cpp 2013-05-27 20:01:44.007301649 +0200 @@ -36,6 +36,7 @@ #include <cstdlib> #include <cstring> +#include <iostream> #include <fstream> using namespace orcus; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
