5 changed files with 39 additions and 163 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/liborcus-0.16.1.tar.xz
+SOURCES/liborcus-0.15.4.tar.xz
--- a/.liborcus.metadata
+++ b/.liborcus.metadata
@ -1 +1 @@
-8c84dcd87039f15ee8c9cf7c175d5091d3f56c90 SOURCES/liborcus-0.16.1.tar.xz
+a428ce282806e8e66d439d4cc8827ef91066fbb5 SOURCES/liborcus-0.15.4.tar.xz
--- a/SOURCES/liborcus-gcc11.patch
+++ b/SOURCES/liborcus-gcc11.patch
@ -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;
- 
--- a/SOURCES/liborcus-noexamples.patch
+++ b/SOURCES/liborcus-noexamples.patch
@ -1,8 +1,11 @@
--- 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
+--- a/Makefile.in	2018-09-14 22:51:18.000000000 +0100
+++ b/Makefile.in	2020-03-17 15:37:37.493186784 +0000
+@@ -407,7 +407,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src include parser_handlers benchmark	doc_example
+SUBDIRS = src include parser_handlers benchmark
 ACLOCAL_AMFLAGS = -I m4
- 
- pcfiles = liborcus-@ORCUS_API_VERSION@.pc
+ pcfiles = liborcus-@ORCUS_API_VERSION@.pc $(am__append_1)
+ pkgconfig_DATA = $(pcfiles)
--- a/SPECS/liborcus.spec
+++ b/SPECS/liborcus.spec
@ -1,49 +1,34 @@
-%global apiversion 0.16
-
-%if 0%{?rhel}
+%global apiversion 0.15

 # 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}
+Version: 0.15.4
+Release: 2%{?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
+Source0: http://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.16)
+BuildRequires: pkgconfig(libixion-0.15)
 %endif
 BuildRequires: pkgconfig(mdds-1.5)
 %if %{with python}
 BuildRequires: pkgconfig(python3)
-%if 0%{?rhel}
-BuildRequires: python3
-%endif
 %endif
 BuildRequires: pkgconfig(zlib)

+Patch0: liborcus-noexamples.patch
+
 %description
 %{name} is a standalone file import filter library for spreadsheet
 documents. Currently under development are ODS, XLSX and CSV import
@ -102,28 +87,27 @@ API documentation for %{name}.
 %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
+make %{?_smp_mflags}

 %install
-%make_install
+make install DESTDIR=%{buildroot}
 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
+help2man -N -S '%{name} %{version}' -n 'convert a CSV file' -o orcus-csv.1 %{buildroot}/usr/bin/orcus-csv
+help2man -N -S '%{name} %{version}' -n 'convert a Gnumeric file' -o orcus-gnumeric.1 %{buildroot}/usr/bin/orcus-gnumeric
+help2man -N -S '%{name} %{version}' -n 'convert an ODF spreadsheet' -o orcus-ods.1 %{buildroot}/usr/bin/orcus-ods
+help2man -N -S '%{name} %{version}' -n 'transform an XML file' -o orcus-xls-xml.1 %{buildroot}/usr/bin/orcus-xls-xml
+help2man -N -S '%{name} %{version}' -n 'convert a OpenXML spreadsheet' -o orcus-xlsx.1 %{buildroot}/usr/bin/orcus-xlsx
+help2man -N -S '%{name} %{version}' -n 'convert an XML file' -o orcus-xml.1 %{buildroot}/usr/bin/orcus-xml
 install -m 0755 -d %{buildroot}/%{_mandir}/man1
 install -p -m 0644 orcus-*.1 %{buildroot}/%{_mandir}/man1
 %endif
@ -135,10 +119,12 @@ make doc-doxygen
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 make check %{?_smp_mflags}

-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig

 %if %{with convtools}
-%ldconfig_scriptlets model
+%post model -p /sbin/ldconfig
+%postun model -p /sbin/ldconfig
 %endif

 %files
@ -199,94 +185,17 @@ make check %{?_smp_mflags}
 %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
+* Sun Oct 25 2020 Caolán McNamara <caolanm@redhat.com> - 0.15.4-2
+- Related: rhbz#1881132 update to 0.15.4

-* 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
+* Thu Oct 22 2020 Caolán McNamara <caolanm@redhat.com> - 0.15.4-1
+- Resolves: rhbz#1881132 update to 0.15.4

-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Fri Mar 13 2020 Caolán McNamara <caolanm@redhat.com> - 0.14.1-1
+- Related: rhbz#1796893 update to 0.14.1

-* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 0.16.1-5
- Rebuilt for Boost 1.75
-
-* 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
- Fix missing headers for gcc-11
-
-* Tue Sep 29 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.1-1
- latest release
-
-* Fri Sep 25 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.0-3
- reenable make check
-
-* Fri Sep 25 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.0-2
- replace -DSIZEOF_VOID_P=4 with upstream solution
-
-* Thu Sep 24 2020 Caolán McNamara <caolanm@redhat.com> - 0.16.0-1
- latest release
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.15.3-5
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 0.15.3-4
- Rebuilt for Boost 1.73
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.15.3-3
- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Nov 02 2019 David Tardon <dtardon@redhat.com> - 0.15.3-1
- new upstream release
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.15.2-2
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 29 2019 Caolán McNamara <caolanm@redhat.com> - 0.15.2-1
- new upstream release
-
-* Tue Aug 20 2019 Caolán McNamara <caolanm@redhat.com> - 0.15.0-1
- new upstream release
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.14.1-6
- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Apr 05 2019 Stephan Bergmann <sbergman@redhat.com> - 0.14.1-4
- Replace hard-coded /usr/bin with _bindir macro for flatpak build
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 0.14.1-2
- Rebuilt for Boost 1.69
-
-* Fri Oct 26 2018 David Tardon <dtardon@redhat.com> - 0.14.1-1
- new upstream release
-
-* Sun Sep 02 2018 David Tardon <dtardon@redhat.com> - 0.14.0-1
- new upstream release
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.13.4-2
- Rebuilt for Python 3.7
+* Wed Jun 06 2018 David Tardon <dtardon@redhat.com> - 0.13.4-2
+- drop dependency on libixion

 * Wed Feb 28 2018 David Tardon <dtardon@redhat.com> - 0.13.4-1
 - new upstream release