Compare commits
No commits in common. 'c9' and 'f41' have entirely different histories.
@ -1 +1,3 @@
|
||||
SOURCES/liborcus-0.16.1.tar.xz
|
||||
/liborcus-0.17.2.tar.xz
|
||||
/liborcus-0.18.1.tar.xz
|
||||
/liborcus-0.19.2.tar.xz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
8c84dcd87039f15ee8c9cf7c175d5091d3f56c90 SOURCES/liborcus-0.16.1.tar.xz
|
||||
@ -1,36 +0,0 @@
|
||||
diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
|
||||
index d9e16ef..604b0f8 100644
|
||||
--- a/src/liborcus/orcus_xlsx.cpp
|
||||
+++ b/src/liborcus/orcus_xlsx.cpp
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "ooxml_global.hpp"
|
||||
#include "spreadsheet_iface_util.hpp"
|
||||
|
||||
+#include <limits>
|
||||
#include <cstdlib>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
|
||||
index 3ca72e5..7504b4c 100644
|
||||
--- a/src/liborcus/xls_xml_context.cpp
|
||||
+++ b/src/liborcus/xls_xml_context.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <mdds/sorted_string_map.hpp>
|
||||
|
||||
#include <iostream>
|
||||
+#include <limits>
|
||||
|
||||
using namespace std;
|
||||
namespace ss = orcus::spreadsheet;
|
||||
diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
|
||||
index edfd9ee..0b6ec0a 100644
|
||||
--- a/src/liborcus/xlsx_revision_context.cpp
|
||||
+++ b/src/liborcus/xlsx_revision_context.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "orcus/global.hpp"
|
||||
|
||||
#include <iostream>
|
||||
+#include <limits>
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
--- a/Makefile.am 2018-09-14 22:51:18.000000000 +0100
|
||||
+++ b/Makefile.am 2020-03-17 15:37:37.493186784 +0000
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS = src include benchmark doc_example
|
||||
+SUBDIRS = src include benchmark
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
pcfiles = liborcus-@ORCUS_API_VERSION@.pc
|
||||
@ -1,210 +1,29 @@
|
||||
%global apiversion 0.16
|
||||
|
||||
%if 0%{?rhel}
|
||||
|
||||
# build conversion tools
|
||||
%bcond_with convtools
|
||||
# build python3 bindings
|
||||
%bcond_with python
|
||||
|
||||
%else
|
||||
# build conversion tools
|
||||
%bcond_without convtools
|
||||
# build python3 bindings
|
||||
%bcond_without python
|
||||
|
||||
%endif
|
||||
|
||||
Name: liborcus
|
||||
Version: 0.16.1
|
||||
Release: 8%{?dist}
|
||||
Summary: Standalone file import filter library for spreadsheet documents
|
||||
|
||||
License: MPLv2.0
|
||||
URL: https://gitlab.com/orcus/orcus
|
||||
Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
|
||||
Patch0: %{name}-gcc11.patch
|
||||
Patch1: liborcus-noexamples.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: automake
|
||||
%if %{with convtools}
|
||||
BuildRequires: help2man
|
||||
BuildRequires: pkgconfig(libixion-0.16)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(mdds-1.5)
|
||||
%if %{with python}
|
||||
BuildRequires: pkgconfig(python3)
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: python3
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%description
|
||||
%{name} is a standalone file import filter library for spreadsheet
|
||||
documents. Currently under development are ODS, XLSX and CSV import
|
||||
filters.
|
||||
|
||||
%if %{with convtools}
|
||||
%package model
|
||||
Summary: Spreadsheet model for %{name} conversion tools
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description model
|
||||
The %{name}-model package contains a spreadsheet model used by the
|
||||
conversion tools.
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%package tools
|
||||
Summary: Tools for working with %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description tools
|
||||
Helper tools for %{name} and converters of various file formats to HTML
|
||||
and text.
|
||||
|
||||
%if %{with python}
|
||||
%package python3
|
||||
Summary: Python 3 bindings for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description python3
|
||||
Python 3 bindings for %{name}.
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: API documentation for %{name}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%if %{without convtools}
|
||||
%global condopts %{?condopts} --disable-spreadsheet-model
|
||||
%endif
|
||||
%if %{without python}
|
||||
%global condopts %{?condopts} --disable-python
|
||||
%endif
|
||||
|
||||
%build
|
||||
autoreconf
|
||||
%configure --disable-debug --disable-silent-rules --disable-static \
|
||||
--disable-werror --with-pic %{?condopts}
|
||||
sed -i \
|
||||
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
|
||||
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
|
||||
libtool
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{python3_sitearch}/*.la
|
||||
|
||||
%if %{with convtools}
|
||||
# create and install man pages
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
help2man -N -S '%{name} %{version}' -n 'convert a CSV file' -o orcus-csv.1 %{buildroot}%{_bindir}/orcus-csv
|
||||
help2man -N -S '%{name} %{version}' -n 'convert a Gnumeric file' -o orcus-gnumeric.1 %{buildroot}%{_bindir}/orcus-gnumeric
|
||||
help2man -N -S '%{name} %{version}' -n 'convert an ODF spreadsheet' -o orcus-ods.1 %{buildroot}%{_bindir}/orcus-ods
|
||||
help2man -N -S '%{name} %{version}' -n 'transform an XML file' -o orcus-xls-xml.1 %{buildroot}%{_bindir}/orcus-xls-xml
|
||||
help2man -N -S '%{name} %{version}' -n 'convert a OpenXML spreadsheet' -o orcus-xlsx.1 %{buildroot}%{_bindir}/orcus-xlsx
|
||||
help2man -N -S '%{name} %{version}' -n 'convert an XML file' -o orcus-xml.1 %{buildroot}%{_bindir}/orcus-xml
|
||||
install -m 0755 -d %{buildroot}/%{_mandir}/man1
|
||||
install -p -m 0644 orcus-*.1 %{buildroot}/%{_mandir}/man1
|
||||
%endif
|
||||
|
||||
# build documentation
|
||||
make doc-doxygen
|
||||
|
||||
%check
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
make check %{?_smp_mflags}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%if %{with convtools}
|
||||
%ldconfig_scriptlets model
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc AUTHORS CHANGELOG
|
||||
%license LICENSE
|
||||
%{_libdir}/%{name}-%{apiversion}.so.*
|
||||
%{_libdir}/%{name}-mso-%{apiversion}.so.*
|
||||
%{_libdir}/%{name}-parser-%{apiversion}.so.*
|
||||
|
||||
%if %{with convtools}
|
||||
%files model
|
||||
%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so.*
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}-%{apiversion}
|
||||
%{_libdir}/%{name}-%{apiversion}.so
|
||||
%{_libdir}/%{name}-mso-%{apiversion}.so
|
||||
%{_libdir}/%{name}-parser-%{apiversion}.so
|
||||
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
|
||||
%if %{with convtools}
|
||||
%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so
|
||||
%{_libdir}/pkgconfig/%{name}-spreadsheet-model-%{apiversion}.pc
|
||||
%endif
|
||||
|
||||
%files tools
|
||||
%{_bindir}/orcus-css-dump
|
||||
%{_bindir}/orcus-detect
|
||||
%{_bindir}/orcus-json
|
||||
%{_bindir}/orcus-mso-encryption
|
||||
%{_bindir}/orcus-zip-dump
|
||||
%{_bindir}/orcus-yaml
|
||||
%if %{with convtools}
|
||||
%{_bindir}/orcus-csv
|
||||
%{_bindir}/orcus-gnumeric
|
||||
%{_bindir}/orcus-ods
|
||||
%{_bindir}/orcus-styles-ods
|
||||
%{_bindir}/orcus-xls-xml
|
||||
%{_bindir}/orcus-xlsx
|
||||
%{_bindir}/orcus-xml
|
||||
%{_mandir}/man1/orcus-csv.1*
|
||||
%{_mandir}/man1/orcus-gnumeric.1*
|
||||
%{_mandir}/man1/orcus-ods.1*
|
||||
%{_mandir}/man1/orcus-xls-xml.1*
|
||||
%{_mandir}/man1/orcus-xlsx.1*
|
||||
%{_mandir}/man1/orcus-xml.1*
|
||||
%endif
|
||||
|
||||
%if %{with python}
|
||||
%files python3
|
||||
%{python3_sitearch}/_orcus.so
|
||||
%{python3_sitearch}/_orcus_json.so
|
||||
%{python3_sitelib}/orcus
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%license LICENSE
|
||||
%doc doc/_doxygen/html
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.16.1-8
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.16.1-7
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
* Mon Nov 21 2022 David Tardon <dtardon@redhat.com> - 0.17.2-5
|
||||
- Convert license to SPDX
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.17.2-3
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 0.17.2-2
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Wed Feb 02 2022 Caolán McNamara <caolanm@redhat.com> - 0.17.2-1
|
||||
- Resolves: rhbz#2018620 Update to 0.17.2
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Aug 07 2021 Jonathan Wakely <jwakely@redhat.com> - 0.16.1-9
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.16.1-7
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
@ -0,0 +1,200 @@
|
||||
%global apiversion 0.18
|
||||
|
||||
%if 0%{?rhel}
|
||||
|
||||
# build conversion tools
|
||||
%bcond_with convtools
|
||||
# build python3 bindings
|
||||
%bcond_with python
|
||||
|
||||
%else
|
||||
# build conversion tools
|
||||
%bcond_without convtools
|
||||
# build python3 bindings
|
||||
%bcond_without python
|
||||
|
||||
%endif
|
||||
|
||||
Name: liborcus
|
||||
Version: 0.19.2
|
||||
Release: %autorelease
|
||||
Summary: Standalone file import filter library for spreadsheet documents
|
||||
|
||||
License: MPL-2.0
|
||||
URL: https://gitlab.com/orcus/orcus
|
||||
Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: automake
|
||||
%if %{with convtools}
|
||||
BuildRequires: help2man
|
||||
BuildRequires: pkgconfig(libixion-0.18)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(mdds-2.1)
|
||||
%if %{with python}
|
||||
BuildRequires: pkgconfig(python3)
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: python3
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
|
||||
%description
|
||||
%{name} is a standalone file import filter library for spreadsheet
|
||||
documents. Currently under development are ODS, XLSX and CSV import
|
||||
filters.
|
||||
|
||||
%if %{with convtools}
|
||||
%package model
|
||||
Summary: Spreadsheet model for %{name} conversion tools
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description model
|
||||
The %{name}-model package contains a spreadsheet model used by the
|
||||
conversion tools.
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%package tools
|
||||
Summary: Tools for working with %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description tools
|
||||
Helper tools for %{name} and converters of various file formats to HTML
|
||||
and text.
|
||||
|
||||
%if %{with python}
|
||||
%package python3
|
||||
Summary: Python 3 bindings for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description python3
|
||||
Python 3 bindings for %{name}.
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: API documentation for %{name}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%if %{without convtools}
|
||||
%global condopts %{?condopts} --disable-spreadsheet-model
|
||||
%endif
|
||||
%if %{without python}
|
||||
%global condopts %{?condopts} --disable-python
|
||||
%endif
|
||||
|
||||
%build
|
||||
autoreconf
|
||||
%configure --disable-debug --disable-silent-rules --disable-static \
|
||||
--disable-werror --with-pic %{?condopts}
|
||||
sed -i \
|
||||
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
|
||||
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
|
||||
libtool
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{python3_sitearch}/*.la
|
||||
|
||||
%if %{with convtools}
|
||||
# create and install man pages
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
help2man -N -S '%{name} %{version}' -n 'convert a CSV file' -o orcus-csv.1 %{buildroot}%{_bindir}/orcus-csv
|
||||
help2man -N -S '%{name} %{version}' -n 'convert a Gnumeric file' -o orcus-gnumeric.1 %{buildroot}%{_bindir}/orcus-gnumeric
|
||||
help2man -N -S '%{name} %{version}' -n 'convert an ODF spreadsheet' -o orcus-ods.1 %{buildroot}%{_bindir}/orcus-ods
|
||||
help2man -N -S '%{name} %{version}' -n 'transform an XML file' -o orcus-xls-xml.1 %{buildroot}%{_bindir}/orcus-xls-xml
|
||||
help2man -N -S '%{name} %{version}' -n 'convert a OpenXML spreadsheet' -o orcus-xlsx.1 %{buildroot}%{_bindir}/orcus-xlsx
|
||||
help2man -N -S '%{name} %{version}' -n 'convert an XML file' -o orcus-xml.1 %{buildroot}%{_bindir}/orcus-xml
|
||||
install -m 0755 -d %{buildroot}/%{_mandir}/man1
|
||||
install -p -m 0644 orcus-*.1 %{buildroot}/%{_mandir}/man1
|
||||
%endif
|
||||
|
||||
# build documentation
|
||||
make doc-doxygen
|
||||
|
||||
%check
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
make check %{?_smp_mflags}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%if %{with convtools}
|
||||
%ldconfig_scriptlets model
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc AUTHORS CHANGELOG
|
||||
%license LICENSE
|
||||
%{_libdir}/%{name}-%{apiversion}.so.*
|
||||
%{_libdir}/%{name}-mso-%{apiversion}.so.*
|
||||
%{_libdir}/%{name}-parser-%{apiversion}.so.*
|
||||
|
||||
%if %{with convtools}
|
||||
%files model
|
||||
%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so.*
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}-%{apiversion}
|
||||
%{_libdir}/%{name}-%{apiversion}.so
|
||||
%{_libdir}/%{name}-mso-%{apiversion}.so
|
||||
%{_libdir}/%{name}-parser-%{apiversion}.so
|
||||
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
|
||||
%if %{with convtools}
|
||||
%{_libdir}/%{name}-spreadsheet-model-%{apiversion}.so
|
||||
%{_libdir}/pkgconfig/%{name}-spreadsheet-model-%{apiversion}.pc
|
||||
%endif
|
||||
|
||||
%files tools
|
||||
%{_bindir}/orcus-css-dump
|
||||
%{_bindir}/orcus-detect
|
||||
%{_bindir}/orcus-json
|
||||
%{_bindir}/orcus-mso-encryption
|
||||
%{_bindir}/orcus-zip-dump
|
||||
%{_bindir}/orcus-yaml
|
||||
%if %{with convtools}
|
||||
%{_bindir}/orcus-csv
|
||||
%{_bindir}/orcus-gnumeric
|
||||
%{_bindir}/orcus-ods
|
||||
%{_bindir}/orcus-styles-ods
|
||||
%{_bindir}/orcus-xls-xml
|
||||
%{_bindir}/orcus-xlsx
|
||||
%{_bindir}/orcus-xml
|
||||
%{_mandir}/man1/orcus-csv.1*
|
||||
%{_mandir}/man1/orcus-gnumeric.1*
|
||||
%{_mandir}/man1/orcus-ods.1*
|
||||
%{_mandir}/man1/orcus-xls-xml.1*
|
||||
%{_mandir}/man1/orcus-xlsx.1*
|
||||
%{_mandir}/man1/orcus-xml.1*
|
||||
%endif
|
||||
|
||||
%if %{with python}
|
||||
%files python3
|
||||
%{python3_sitearch}/_orcus.so
|
||||
%{python3_sitearch}/_orcus_json.so
|
||||
%{python3_sitelib}/orcus
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%license LICENSE
|
||||
%doc doc/_doxygen/html
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
Loading…
Reference in new issue