Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/liborcus.git#901517e610131d09a28a292f8edcf058b88c7fc4
This commit is contained in:
DistroBaker 2020-12-11 12:19:55 +01:00
parent 9fa2e1a6a4
commit 747f98c72f
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,8 @@
--- 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

View File

@ -1,19 +1,30 @@
%global apiversion 0.16 %global apiversion 0.16
%if 0%{?rhel}
# build conversion tools
%bcond_with convtools
# build python3 bindings
%bcond_with python
%else
# build conversion tools # build conversion tools
%bcond_without convtools %bcond_without convtools
# build python3 bindings # build python3 bindings
%bcond_without python %bcond_without python
%endif
Name: liborcus Name: liborcus
Version: 0.16.1 Version: 0.16.1
Release: 2%{?dist} Release: 4%{?dist}
Summary: Standalone file import filter library for spreadsheet documents Summary: Standalone file import filter library for spreadsheet documents
License: MPLv2.0 License: MPLv2.0
URL: https://gitlab.com/orcus/orcus URL: https://gitlab.com/orcus/orcus
Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz Source0: https://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz
Patch0: %{name}-gcc11.patch Patch0: %{name}-gcc11.patch
Patch1: liborcus-noexamples.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen BuildRequires: doxygen
@ -187,6 +198,12 @@ make check %{?_smp_mflags}
%doc doc/_doxygen/html %doc doc/_doxygen/html
%changelog %changelog
* Tue Dec 08 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.1-4
- fix build without libixion under rhel
* Wed Dec 02 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.1-3
- build without libixion under rhel
* Mon Oct 19 2020 Jeff Law <law@redhat.com> - 0.16.1-2 * Mon Oct 19 2020 Jeff Law <law@redhat.com> - 0.16.1-2
- Fix missing headers for gcc-11 - Fix missing headers for gcc-11