- updated to 0.7.0 (note: new library names)

- removed obsolete patches

diff --git a/liborcus-am.patch b/liborcus-am.patch
deleted file mode 100644 (file)
index 24cb5aa..0000000
--- a/liborcus-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- liborcus-0.5.1/configure.ac.orig   2013-04-25 21:45:24.494182678 +0200
-+++ liborcus-0.5.1/configure.ac        2013-04-25 21:45:42.664181916 +0200
-@@ -22,7 +22,7 @@
- # =============
- AC_INIT([liborcus],[orcus_version])
- AC_CONFIG_MACRO_DIR([m4])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
- AM_SILENT_RULES([yes])
- AC_LANG([C++])

diff --git a/liborcus-link.patch b/liborcus-link.patch
deleted file mode 100644 (file)
index f27448d..0000000
--- a/liborcus-link.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- liborcus-0.5.1/src/Makefile.am.orig        2013-03-25 01:18:18.000000000 +0100
-+++ liborcus-0.5.1/src/Makefile.am     2013-04-26 15:24:37.638182274 +0200
-@@ -36,7 +36,8 @@
- 
- orcus_xml_dump_LDADD = \
-       parser/liborcus-parser-@ORCUS_API_VERSION@.la \
--      liborcus/liborcus-@ORCUS_API_VERSION@.la
-+      liborcus/liborcus-@ORCUS_API_VERSION@.la \
-+      -lpthread
- 
- orcus_xml_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(COMMON_CPPFLAGS)
- 
-@@ -110,7 +111,8 @@
- orcus_xml_LDADD = \
-       liborcus/liborcus-@ORCUS_API_VERSION@.la \
-       parser/liborcus-parser-@ORCUS_API_VERSION@.la \
--      spreadsheet/liborcus-spreadsheet-model-@ORCUS_API_VERSION@.la
-+      spreadsheet/liborcus-spreadsheet-model-@ORCUS_API_VERSION@.la \
-+      -lpthread
- 
- orcus_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(COMMON_CPPFLAGS)
- 
---- liborcus_0.3.0/src/spreadsheet/Makefile.am.orig    2012-11-28 13:21:10.000000000 +0100
-+++ liborcus_0.3.0/src/spreadsheet/Makefile.am 2013-04-01 07:28:42.121989280 +0200
-@@ -17,6 +17,6 @@
- 
- liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_CXXFLAGS = $(LIBIXION_CFLAGS)
- liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
--liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_LIBADD = $(LIBIXION_LIBS)
-+liborcus_spreadsheet_model_@ORCUS_API_VERSION@_la_LIBADD = $(LIBIXION_LIBS) $(top_builddir)/src/liborcus/liborcus-@ORCUS_API_VERSION@.la
- 
- endif
---- liborcus-0.5.1/src/parser/Makefile.am.orig 2013-04-12 16:25:03.000000000 +0200
-+++ liborcus-0.5.1/src/parser/Makefile.am      2013-04-26 15:43:10.978135549 +0200
-@@ -20,6 +20,7 @@
- 
- liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
- liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \
-+      $(BOOST_SYSTEM_LIB) \
-        $(ZLIB_LIBS)
- 
- EXTRA_PROGRAMS = \
---- liborcus-0.5.1/src/liborcus/Makefile.am.orig       2013-04-12 16:24:50.000000000 +0200
-+++ liborcus-0.5.1/src/liborcus/Makefile.am    2013-04-26 16:53:18.567958975 +0200
-@@ -175,6 +175,7 @@
-       $(BOOST_SYSTEM_CFLAGS) $(ZLIB_CFLAGS)
- liborcus_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
- liborcus_@ORCUS_API_VERSION@_la_LIBADD = \
-+      $(top_builddir)/src/parser/liborcus-parser-@ORCUS_API_VERSION@.la \
-        $(BOOST_SYSTEM_LIBS) $(BOOST_SYSTEM_LIB) $(ZLIB_LIBS)
- 
- # liborcus-test-xml-map-tree

diff --git a/liborcus.spec b/liborcus.spec
index 217d9af2155af30bcf2d31c9d6e86b5ef9b5c10a..9d91a533ceb12097a8971c4c1dead5501ec5cd4c 100644 (file)
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -7,25 +7,22 @@
 Summary:       Standalone file import filter library for spreadsheet documents
 Summary(pl.UTF-8):     Biblioteka samodzielnego filtra importującego pliki dla arkuszy kalkulacyjnych
 Name:          liborcus
-Version:       0.5.1
-Release:       3
+Version:       0.7.0
+Release:       1
 License:       MIT
 Group:         Libraries
 #Source0Download: http://gitorious.org/orcus/pages/Download
 Source0:       http://kohei.us/files/orcus/src/%{name}-%{version}.tar.bz2
-# Source0-md5: ea2acaf140ae40a87a952caa75184f4d
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-am.patch
-Patch2:                mdds-0.8.0.patch
+# Source0-md5: 7681383be6ce489d84c1c74f4e7f9643
 URL:           http://gitorious.org/orcus
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
-BuildRequires: boost-devel
-%{?with_ixion:BuildRequires:   ixion-devel >= 0.5}
+BuildRequires: boost-devel >= 1.36
+%{?with_ixion:BuildRequires:   ixion-devel >= 0.7}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
 %{?with_libzip:BuildRequires:  libzip-devel}
-BuildRequires: mdds-devel
+BuildRequires: mdds-devel >= 0.8.0
 BuildRequires: pkgconfig >= 1:0.20
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,7 +42,7 @@ Summary:      Header files for liborcus
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki liborcus
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      boost-devel
+Requires:      boost-devel >= 1.36
 Requires:      libstdc++-devel
 
 %description devel
@@ -73,7 +70,7 @@ Summary:      liborcus spreadsheet model library
 Summary(pl.UTF-8):     Biblioteka liborcus spreadsheet model
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      ixion >= 0.5
+Requires:      ixion >= 0.7
 
 %description spreadsheet
 liborcus spreadsheet model library.
@@ -87,7 +84,7 @@ Summary(pl.UTF-8):    Pliki programistyczne biblioteki liborcus spreadsheet model
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      %{name}-spreadsheet = %{version}-%{release}
-Requires:      ixion-devel >= 0.5
+Requires:      ixion-devel >= 0.7
 
 %description spreadsheet-devel
 Development files for liborcus spreadsheet model library.
@@ -109,9 +106,6 @@ Biblioteka statyczna liborcus spreadsheet model.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -151,30 +145,31 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
+%attr(755,root,root) %{_bindir}/orcus-detect
 %attr(755,root,root) %{_bindir}/orcus-mso-encryption
 %attr(755,root,root) %{_bindir}/orcus-xml-dump
 %attr(755,root,root) %{_bindir}/orcus-zip-dump
-%attr(755,root,root) %{_libdir}/liborcus-0.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-0.6.so.0
-%attr(755,root,root) %{_libdir}/liborcus-mso-0.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.6.so.0
-%attr(755,root,root) %{_libdir}/liborcus-parser-0.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.6.so.0
+%attr(755,root,root) %{_libdir}/liborcus-0.8.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-0.8.so.0
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.8.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.8.so.0
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.8.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.8.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-0.6.so
-%attr(755,root,root) %{_libdir}/liborcus-mso-0.6.so
-%attr(755,root,root) %{_libdir}/liborcus-parser-0.6.so
-%{_includedir}/liborcus-0.6
-%{_pkgconfigdir}/liborcus-0.6.pc
+%attr(755,root,root) %{_libdir}/liborcus-0.8.so
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.8.so
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.8.so
+%{_includedir}/liborcus-0.8
+%{_pkgconfigdir}/liborcus-0.8.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/liborcus-0.6.a
-%{_libdir}/liborcus-mso-0.6.a
-%{_libdir}/liborcus-parser-0.6.a
+%{_libdir}/liborcus-0.8.a
+%{_libdir}/liborcus-mso-0.8.a
+%{_libdir}/liborcus-parser-0.8.a
 %endif
 
 %if %{with ixion}
@@ -183,17 +178,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/orcus-csv
 %attr(755,root,root) %{_bindir}/orcus-gnumeric
 %attr(755,root,root) %{_bindir}/orcus-ods
+%attr(755,root,root) %{_bindir}/orcus-xls-xml
 %attr(755,root,root) %{_bindir}/orcus-xlsx
 %attr(755,root,root) %{_bindir}/orcus-xml
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.6.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.6.so.0
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.8.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.8.so.0
 
 %files spreadsheet-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.6.so
-%{_pkgconfigdir}/liborcus-spreadsheet-model-0.6.pc
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.8.so
+%{_pkgconfigdir}/liborcus-spreadsheet-model-0.8.pc
 
 %files spreadsheet-static
 %defattr(644,root,root,755)
-%{_libdir}/liborcus-spreadsheet-model-0.6.a
+%{_libdir}/liborcus-spreadsheet-model-0.8.a
 %endif

diff --git a/mdds-0.8.0.patch b/mdds-0.8.0.patch
deleted file mode 100644 (file)
index 0e20f5d..0000000
--- a/mdds-0.8.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- liborcus-0.5.1/src/spreadsheet/sheet.cpp~  2013-04-10 21:43:07.000000000 +0200
-+++ liborcus-0.5.1/src/spreadsheet/sheet.cpp   2013-07-09 00:43:52.783524094 +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;