From: Jakub Bogusz Date: Fri, 10 Mar 2023 20:54:45 +0000 (+0100) Subject: - updated to 0.17.2 (for libreoffice 7.5.x) X-Git-Tag: auto/th/liborcus-0.17.2-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fliborcus.git;a=commitdiff_plain;h=d5164cc815df18251496a64cc244a2b7bff4f8ed - updated to 0.17.2 (for libreoffice 7.5.x) --- diff --git a/liborcus-gcc11.patch b/liborcus-gcc11.patch deleted file mode 100644 index f1dda13..0000000 --- a/liborcus-gcc11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001 -From: hedmo -Date: Fri, 8 Jan 2021 07:30:16 +0000 -Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11 - ---- - src/liborcus/orcus_xlsx.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp -index 6df72a32..a59b2b9d 100644 ---- a/src/liborcus/orcus_xlsx.cpp -+++ b/src/liborcus/orcus_xlsx.cpp -@@ -32,6 +32,7 @@ - - #include - #include -+#include - #include - #include - #include --- -GitLab - -From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001 -From: hedmo -Date: Fri, 8 Jan 2021 07:32:53 +0000 -Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11 - ---- - src/liborcus/xls_xml_context.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp -index 538f5607..ca3dc4d0 100644 ---- a/src/liborcus/xls_xml_context.cpp -+++ b/src/liborcus/xls_xml_context.cpp -@@ -16,6 +16,7 @@ - #include - - #include -+#include - - using namespace std; - namespace ss = orcus::spreadsheet; --- -GitLab - -From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001 -From: hedmo -Date: Fri, 8 Jan 2021 07:34:17 +0000 -Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11 - ---- - src/liborcus/xlsx_revision_context.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp -index edfd9eed..0b6ec0af 100644 ---- a/src/liborcus/xlsx_revision_context.cpp -+++ b/src/liborcus/xlsx_revision_context.cpp -@@ -16,6 +16,7 @@ - #include "orcus/global.hpp" - - #include -+#include - - using namespace std; - --- -GitLab - diff --git a/liborcus.spec b/liborcus.spec index 674b582..3b047ce 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -8,25 +8,30 @@ 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.16.1 -Release: 8 +# keep in sync with BuildRequires in libreoffice.spec +Version: 0.17.2 +Release: 1 License: MPL v2.0 Group: Libraries #Source0Download: https://gitlab.com/orcus/orcus/-/releases -Source0: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz -# Source0-md5: be30a66fa4249e5fea90db2872c5be68 +Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz +# Source0-md5: 4df3646ca736fa0d04965e25fee4898e Patch0: %{name}-flags.patch -Patch1: %{name}-gcc11.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.16.0} -BuildRequires: libstdc++-devel >= 6:4.7 +%if %{with ixion} +BuildRequires: ixion-devel >= 0.17.0 +BuildRequires: ixion-devel < 0.18 +%endif +BuildRequires: libstdc++-devel >= 6:7 BuildRequires: libtool >= 2:1.5 -BuildRequires: mdds-devel >= 1.5.0 +BuildRequires: mdds-devel >= 2.0.0 +BuildRequires: mdds-devel < 2.1 BuildRequires: pkgconfig >= 1:0.20 %{?with_python:BuildRequires: python3-devel >= 1:3.2} +BuildRequires: rpm-build >= 4.6 BuildRequires: tar >= 1:1.22 BuildRequires: xz BuildRequires: zlib-devel @@ -55,7 +60,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki liborcus Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: boost-devel >= 1.36 -Requires: libstdc++-devel >= 6:4.7 +Requires: libstdc++-devel >= 6:7 %description devel This package contains the header files for developing applications @@ -82,7 +87,7 @@ Summary: liborcus spreadsheet model library Summary(pl.UTF-8): Biblioteka liborcus spreadsheet model Group: Libraries Requires: %{name} = %{version}-%{release} -Requires: ixion >= 0.16.0 +Requires: ixion >= 0.17.0 %description spreadsheet liborcus spreadsheet model library. @@ -96,7 +101,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.16.0 +Requires: ixion-devel >= 0.17.0 %description spreadsheet-devel Development files for liborcus spreadsheet model library. @@ -120,6 +125,7 @@ Biblioteka statyczna liborcus spreadsheet model. Summary: API documentation for orcus libraries Summary(pl.UTF-8): Dokumentacja API bibliotek orcus Group: Documentation +BuildArch: noarch %description apidocs API documentation for orcus libraries. @@ -143,7 +149,6 @@ Wiązanie Pythona 3 do biblioteki liborcus. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -207,27 +212,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.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 +%attr(755,root,root) %{_libdir}/liborcus-0.17.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-0.17.so.0 +%attr(755,root,root) %{_libdir}/liborcus-mso-0.17.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-mso-0.17.so.0 +%attr(755,root,root) %{_libdir}/liborcus-parser-0.17.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-parser-0.17.so.0 %files devel %defattr(644,root,root,755) -%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 +%attr(755,root,root) %{_libdir}/liborcus-0.17.so +%attr(755,root,root) %{_libdir}/liborcus-mso-0.17.so +%attr(755,root,root) %{_libdir}/liborcus-parser-0.17.so +%{_includedir}/liborcus-0.17 +%{_pkgconfigdir}/liborcus-0.17.pc %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/liborcus-0.16.a -%{_libdir}/liborcus-mso-0.16.a -%{_libdir}/liborcus-parser-0.16.a +%{_libdir}/liborcus-0.17.a +%{_libdir}/liborcus-mso-0.17.a +%{_libdir}/liborcus-parser-0.17.a %endif %if %{with ixion} @@ -241,18 +246,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.16.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.16.so.0 +%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.17.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liborcus-spreadsheet-model-0.17.so.0 %files spreadsheet-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.16.so -%{_pkgconfigdir}/liborcus-spreadsheet-model-0.16.pc +%attr(755,root,root) %{_libdir}/liborcus-spreadsheet-model-0.17.so +%{_pkgconfigdir}/liborcus-spreadsheet-model-0.17.pc %if %{with static_libs} %files spreadsheet-static %defattr(644,root,root,755) -%{_libdir}/liborcus-spreadsheet-model-0.16.a +%{_libdir}/liborcus-spreadsheet-model-0.17.a %endif %endif