- updated to 0.16.1 (new library names)

- updated flags patch

diff --git a/liborcus-flags.patch b/liborcus-flags.patch
index 9da291a7f92e5a882cc952c43fae2d24cec222e7..c77647e9da6bcf0988dcdd6db4ab0cdc3cfca99e 100644 (file)
--- a/liborcus-flags.patch
+++ b/liborcus-flags.patch
@@ -1,14 +1,14 @@
---- liborcus-0.15.3/configure.ac.orig  2019-10-30 18:19:29.732194417 +0100
-+++ liborcus-0.15.3/configure.ac       2019-10-30 18:20:45.765115844 +0100
-@@ -109,10 +109,9 @@
-       [enable_debug=no]
+--- liborcus-0.16.1/configure.ac.orig  2020-10-31 08:29:30.443076469 +0100
++++ liborcus-0.16.1/configure.ac       2020-10-31 08:30:02.636235397 +0100
+@@ -112,10 +112,9 @@
+         [enable_debug=no]
  )
  AS_IF([test "x$enable_debug" != "xno"], [
--      CXXFLAGS="$CXXFLAGS -g -O0 -DMDDS_ASSERT_STRING_MAP"
-+      CXXFLAGS="$CXXFLAGS -g -DMDDS_ASSERT_STRING_MAP"
+-        CXXFLAGS="$CXXFLAGS -g -O0 -DMDDS_ASSERT_STRING_MAP"
++        CXXFLAGS="$CXXFLAGS -g -DMDDS_ASSERT_STRING_MAP"
          enable_debug_utils=yes
  ], [
--      CXXFLAGS="$CXXFLAGS -O2"
-       AC_DEFINE([NDEBUG], [], [Disable debugging information])
+-        CXXFLAGS="$CXXFLAGS -O2"
+         AC_DEFINE([NDEBUG], [], [Disable debugging information])
  ])
  

diff --git a/liborcus.spec b/liborcus.spec
index a7e9fd04a459b8560677f55c8f969db6d4d9ac40..94aa399dcf23ac47dcbe149dcfa97b89f0d0d61f 100644 (file)
--- a/liborcus.spec
+++ b/liborcus.spec
@@ -8,19 +8,19 @@
 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.15.4
-Release:       2
+Version:       0.16.1
+Release:       1
 License:       MPL v2.0
 Group:         Libraries
-#Source0Download: https://gitlab.com/orcus/orcus/raw/master/README.md
+#Source0Download: https://gitlab.com/orcus/orcus/-/releases
 Source0:       http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
-# Source0-md5: 67a81c37bfe37e609222fa28f2351f52
+# Source0-md5: be30a66fa4249e5fea90db2872c5be68
 Patch0:                %{name}-flags.patch
 URL:           https://gitlab.com/orcus/orcus
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
 BuildRequires: boost-devel >= 1.36
-%{?with_ixion:BuildRequires:   ixion-devel >= 0.15.0}
+%{?with_ixion:BuildRequires:   ixion-devel >= 0.16.0}
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: libtool >= 2:1.5
 BuildRequires: mdds-devel >= 1.5.0
@@ -32,6 +32,7 @@ BuildRequires:        zlib-devel
 %if %{with apidocs}
 BuildRequires: doxygen
 BuildRequires: python3-breathe
+BuildRequires: python3-sphinx_argparse
 BuildRequires: python3-sphinx_rtd_theme
 BuildRequires: sphinx-pdg-3
 %endif
@@ -80,7 +81,7 @@ Summary:      liborcus spreadsheet model library
 Summary(pl.UTF-8):     Biblioteka liborcus spreadsheet model
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      ixion >= 0.15.0
+Requires:      ixion >= 0.16.0
 
 %description spreadsheet
 liborcus spreadsheet model library.
@@ -94,7 +95,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.15.0
+Requires:      ixion-devel >= 0.16.0
 
 %description spreadsheet-devel
 Development files for liborcus spreadsheet model library.
@@ -204,27 +205,27 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/orcus-mso-encryption
 %attr(755,root,root) %{_bindir}/orcus-yaml
 %attr(755,root,root) %{_bindir}/orcus-zip-dump
-%attr(755,root,root) %{_libdir}/liborcus-0.15.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-0.15.so.0
-%attr(755,root,root) %{_libdir}/liborcus-mso-0.15.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.15.so.0
-%attr(755,root,root) %{_libdir}/liborcus-parser-0.15.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.15.so.0
+%attr(755,root,root) %{_libdir}/liborcus-0.16.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-0.16.so.0
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.16.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.16.so.0
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.16.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.16.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-0.15.so
-%attr(755,root,root) %{_libdir}/liborcus-mso-0.15.so
-%attr(755,root,root) %{_libdir}/liborcus-parser-0.15.so
-%{_includedir}/liborcus-0.15
-%{_pkgconfigdir}/liborcus-0.15.pc
+%attr(755,root,root) %{_libdir}/liborcus-0.16.so
+%attr(755,root,root) %{_libdir}/liborcus-mso-0.16.so
+%attr(755,root,root) %{_libdir}/liborcus-parser-0.16.so
+%{_includedir}/liborcus-0.16
+%{_pkgconfigdir}/liborcus-0.16.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/liborcus-0.15.a
-%{_libdir}/liborcus-mso-0.15.a
-%{_libdir}/liborcus-parser-0.15.a
+%{_libdir}/liborcus-0.16.a
+%{_libdir}/liborcus-mso-0.16.a
+%{_libdir}/liborcus-parser-0.16.a
 %endif
 
 %if %{with ixion}
@@ -238,18 +239,18 @@ rm -rf $RPM_BUILD_ROOT
 %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.15.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.15.so.0
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.16.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.16.so.0
 
 %files spreadsheet-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.15.so
-%{_pkgconfigdir}/liborcus-spreadsheet-model-0.15.pc
+%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.16.so
+%{_pkgconfigdir}/liborcus-spreadsheet-model-0.16.pc
 
 %if %{with static_libs}
 %files spreadsheet-static
 %defattr(644,root,root,755)
-%{_libdir}/liborcus-spreadsheet-model-0.15.a
+%{_libdir}/liborcus-spreadsheet-model-0.16.a
 %endif
 %endif