merge 7.6.2.1-fc39
This commit is contained in:
commit
16ec1c2e60
6 changed files with 456 additions and 80 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
.*.swp
|
||||
rpm-tmp.*
|
||||
331
CentOS-9/SPECS/libixion.spec
Normal file
331
CentOS-9/SPECS/libixion.spec
Normal file
|
|
@ -0,0 +1,331 @@
|
|||
|
||||
%global apiversion 0.18
|
||||
|
||||
Name: libixion
|
||||
Version: 0.18.0
|
||||
Release: 1
|
||||
Summary: A general purpose formula parser & interpreter library
|
||||
|
||||
License: MPL-2.0
|
||||
URL: https://gitlab.com/ixion/ixion
|
||||
Source0: https://kohei.us/files/ixion/src/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: help2man
|
||||
BuildRequires: automake
|
||||
BuildRequires: pkgconfig(mdds-2.1)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
BuildRequires: pkgconfig(spdlog)
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
Ixion is a general purpose formula parser & interpreter that can calculate
|
||||
multiple named targets, or "cells".
|
||||
|
||||
The goal of this project is to create a library for calculating the results of
|
||||
formula expressions stored in multiple named targets, or “cells”. The cells can
|
||||
be referenced from each other, and the library takes care of resolving their
|
||||
dependencies automatically upon calculation. The caller can run the calculation
|
||||
routine either in a single-threaded mode, or a multi-threaded mode. The library
|
||||
also supports re-calculations where the contents of one or more cells have been
|
||||
modified since the last calculation, and a partial calculation of only the
|
||||
affected cells need to be calculated.
|
||||
|
||||
Supported features:
|
||||
- Each calculation session is defined in a plain text file, which is parsed and
|
||||
interpreted by the Ixion parser.
|
||||
- Fully threaded calculation.
|
||||
- Name resolution using A1-style references.
|
||||
- Support 2D cell references and named expressions.
|
||||
- Support range references.
|
||||
- Dependency tracking during both full calculation and partial re-calculation.
|
||||
- Inline strings.
|
||||
- Volatile functions. The framework for volatile functions is implemented. We
|
||||
just need to implement more functions.
|
||||
|
||||
%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: Testing tools for libixion
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description tools
|
||||
Testing tools for %{name}.
|
||||
|
||||
%package python3
|
||||
Summary: Python 3 bindings for libixion
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < 0.9.1-1
|
||||
Suggests: %{name}-doc = %{version}-%{release}
|
||||
|
||||
%description python3
|
||||
Python 3 bindings for %{name}.
|
||||
|
||||
%package doc
|
||||
Summary: API documentation for %{name}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
autoreconf
|
||||
%configure --disable-silent-rules --disable-static
|
||||
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 %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{python3_sitearch}/*.la
|
||||
|
||||
# create and install man pages
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
help2man -S '%{name} %{version}' -N -n 'formula tokenizer' -o ixion-formula-tokenizer.1 ./src/ixion-formula-tokenizer
|
||||
help2man -S '%{name} %{version}' -N -n 'parser' -o ixion-parser.1 ./src/ixion-parser
|
||||
help2man -S '%{name} %{version}' -N -n 'sorter' -o ixion-sorter.1 ./src/ixion-sorter
|
||||
install -m 0755 -d %{buildroot}/%{_mandir}/man1
|
||||
install -m 0644 ixion-*.1 %{buildroot}/%{_mandir}/man1
|
||||
|
||||
# generate docs
|
||||
# make doc
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%check
|
||||
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
%ifnarch %{ix86}
|
||||
make %{?_smp_mflags} check
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc AUTHORS
|
||||
%license LICENSE
|
||||
%{_libdir}/%{name}-%{apiversion}.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}-%{apiversion}
|
||||
%{_libdir}/%{name}-%{apiversion}.so
|
||||
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
|
||||
|
||||
%files tools
|
||||
%{_bindir}/ixion-formula-tokenizer
|
||||
%{_bindir}/ixion-parser
|
||||
%{_bindir}/ixion-sorter
|
||||
%{_mandir}/man1/ixion-formula-tokenizer.1*
|
||||
%{_mandir}/man1/ixion-parser.1*
|
||||
%{_mandir}/man1/ixion-sorter.1*
|
||||
|
||||
%files python3
|
||||
%{python3_sitearch}/ixion.so
|
||||
|
||||
%files doc
|
||||
%license LICENSE
|
||||
%doc doc/python
|
||||
|
||||
%changelog
|
||||
* Sat Aug 05 2023 Sandino Araico Sánchez <sandino@sandino.net> - 0.18.0-1
|
||||
- 0.18.0 needed for liborcus
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jul 08 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.17.0-12
|
||||
- Rebuilt due to spdlog 1.12 update.
|
||||
|
||||
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.17.0-11
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 0.17.0-10
|
||||
- Rebuilt for Boost 1.81
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Nov 21 2022 David Tardon <dtardon@redhat.com> - 0.17.0-6
|
||||
- Convert license to SPDX
|
||||
|
||||
* Thu Nov 03 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 0.17.0-5
|
||||
- Rebuilt due to spdlog update.
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.17.0-3
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 0.17.0-2
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Wed Feb 02 2022 Caolán McNamara <colanm@redhat.com> - 0.17.0-1
|
||||
- new upstream release
|
||||
- TODO: i686 make check failure in python
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 0.16.1-7
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.16.1-5
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 0.16.1-4
|
||||
- Rebuilt for removed libstdc++ symbol (#1937698)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 0.16.1-2
|
||||
- Rebuilt for Boost 1.75
|
||||
|
||||
* Tue Sep 29 2020 Caolán McNamara <colanm@redhat.com> - 0.16.1-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Sep 24 2020 Caolán McNamara <colanm@redhat.com> - 0.16.0-1
|
||||
- new upstream release
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 0.15.0-4
|
||||
- Rebuilt for Boost 1.73
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.15.0-3
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Aug 20 2019 Caolán McNamara <colanm@redhat.com> - 0.15.0-1
|
||||
- new upstream release
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.14.1-5
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* 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.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.13.0-4
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 0.13.0-2
|
||||
- Rebuilt for Boost 1.66
|
||||
|
||||
* Wed Oct 11 2017 David Tardon <dtardon@redhat.com> - 0.13.0-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Jul 03 2017 Jonathan Wakely <jwakely@redhat.com> - 0.12.2-5
|
||||
- Rebuilt for Boost 1.64
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.12.2-3
|
||||
- Rebuilt for Boost 1.63
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.12.2-2
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Thu Dec 15 2016 David Tardon <dtardon@redhat.com> - 0.12.2-1
|
||||
- new upstream release
|
||||
|
||||
* Mon Sep 26 2016 David Tardon <dtardon@redhat.com> - 0.12.1-1
|
||||
- new upstream release
|
||||
|
||||
* Wed Jul 20 2016 David Tardon <dtardon@redhat.com> - 0.12.0-1
|
||||
- new upstream release
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.1-2
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Thu May 12 2016 David Tardon <dtardon@redhat.com> - 0.11.1-1
|
||||
- new upstream release
|
||||
|
||||
* Fri Mar 11 2016 David Tardon <dtardon@redhat.com> - 0.11.0-2
|
||||
- build python documentation
|
||||
|
||||
* Sun Feb 14 2016 David Tardon <dtardon@redhat.com> - 0.11.0-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 0.9.1-7
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.9.1-6
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.9.1-4
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Apr 13 2015 David Tardon <dtardon@redhat.com> - 0.9.1-2
|
||||
- rebuild for yet another C++ ABI break
|
||||
|
||||
* Sun Apr 05 2015 David Tardon <dtardon@redhat.com> - 0.9.1-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Mar 05 2015 David Tardon <dtardon@redhat.com> - 0.9.0-2
|
||||
- fix python bindings on i386
|
||||
|
||||
* Wed Feb 18 2015 David Tardon <dtardon@redhat.com> - 0.9.0-1
|
||||
- new upstream release
|
||||
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 0.7.0-4
|
||||
- Rebuild for boost 1.57.0
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu May 22 2014 David Tardon <dtardon@redhat.com> - 0.7.0-1
|
||||
- initial import
|
||||
|
||||
|
|
@ -23,6 +23,7 @@ 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
|
||||
#Patch0: liborcus-noexamples.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: boost-devel
|
||||
|
|
@ -31,7 +32,7 @@ BuildRequires: gcc-c++
|
|||
BuildRequires: automake
|
||||
%if %{with convtools}
|
||||
BuildRequires: help2man
|
||||
BuildRequires: pkgconfig(libixion-0.17)
|
||||
BuildRequires: pkgconfig(libixion-0.18)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(mdds-2.1)
|
||||
%if %{with python}
|
||||
|
|
@ -102,7 +103,7 @@ API documentation for %{name}.
|
|||
%build
|
||||
autoreconf
|
||||
%configure --disable-debug --disable-silent-rules --disable-static \
|
||||
--disable-werror --with-pic --without-doc-example %{?condopts}
|
||||
--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' \
|
||||
|
|
@ -197,12 +198,18 @@ make check %{?_smp_mflags}
|
|||
%doc doc/_doxygen/html
|
||||
|
||||
%changelog
|
||||
* Sat Aug 05 2023 Sandino Araico Sánchez <sandino@sandino.net> - 0.18.0-2
|
||||
- Compile on Fedora 39
|
||||
|
||||
* Tue Jul 25 2023 Sandino Araico Sánchez <sandino@sandino.net> - 0.18.1-1
|
||||
- latest release
|
||||
|
||||
* Tue Jul 25 2023 Sandino Araico Sánchez <sandino@sandino.net> - 0.18.0-1
|
||||
- new upstream release needed for libreoffice 7.6
|
||||
|
||||
* Tue Jul 25 2023 Sandino Araico Sánchez <sandino@sandino.net> - 0.18.0-1
|
||||
- New upstream release needed for libreoffice 7.6
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# download path contains version without the last (fourth) digit
|
||||
%global libo_version 7.6.0
|
||||
%global libo_version 7.6.2
|
||||
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
||||
# pre-RC) version. The pre-release string is part of tarball file names,
|
||||
# so we need a way to define it easily at one place.
|
||||
|
|
@ -46,11 +46,14 @@
|
|||
|
||||
%global bundling_options %{nil}
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
Summary: Free Software Productivity Suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.3
|
||||
Release: 1%{?libo_prerelease}%{?dist}
|
||||
Version: %{libo_version}.1
|
||||
Release: 2%{?libo_prerelease}%{?dist}
|
||||
# default new files are: MPLv2
|
||||
# older files are typically: MPLv2 incorporating work under ASLv2
|
||||
# nlpsolver is: LGPLv3
|
||||
|
|
@ -75,9 +78,8 @@ Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c31
|
|||
Source8: libreoffice-multiliblauncher.sh
|
||||
|
||||
Source9: %{external_url}/dtoa-20180411.tgz
|
||||
Source10: %{external_url}/dragonbox-1.1.3.tar.gz
|
||||
Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
|
||||
#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we lose
|
||||
#backwards compatability.
|
||||
Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||
|
|
@ -107,7 +109,6 @@ BuildRequires: findutils
|
|||
BuildRequires: flex
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gettext
|
||||
BuildRequires: git
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: gperf
|
||||
BuildRequires: harfbuzz-icu >= 5.1.0
|
||||
|
|
@ -120,6 +121,7 @@ BuildRequires: patch
|
|||
BuildRequires: perl(Digest::MD5)
|
||||
BuildRequires: perl(FindBin)
|
||||
BuildRequires: perl(base)
|
||||
BuildRequires: perl(lib)
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: glibc-all-langpacks
|
||||
BuildRequires: libappstream-glib
|
||||
|
|
@ -132,6 +134,7 @@ BuildRequires: %{libo_python}-setuptools
|
|||
BuildRequires: Box2D-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: dragonbox-static
|
||||
BuildRequires: fontpackages-devel
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: firebird-devel
|
||||
|
|
@ -222,6 +225,7 @@ BuildRequires: pkgconfig(liborcus-0.18)
|
|||
BuildRequires: pkgconfig(mdds-2.1)
|
||||
BuildRequires: pkgconfig(zxing)
|
||||
BuildRequires: libnumbertext-devel
|
||||
BuildRequires: frozen-static
|
||||
|
||||
%ifarch %{java_arches}
|
||||
# java stuff
|
||||
|
|
@ -236,8 +240,10 @@ BuildRequires: dejavu-sans-fonts
|
|||
BuildRequires: dejavu-serif-fonts
|
||||
BuildRequires: google-carlito-fonts
|
||||
BuildRequires: google-rubik-fonts
|
||||
BuildRequires: google-crosextra-caladea-fonts
|
||||
# Amiri used in vcl/qa/cppunit tests
|
||||
BuildRequires: amiri-fonts
|
||||
BuildRequires: amiri-quran-fonts
|
||||
BuildRequires: liberation-mono-fonts
|
||||
BuildRequires: liberation-narrow-fonts
|
||||
BuildRequires: liberation-sans-fonts
|
||||
|
|
@ -262,15 +268,16 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
|
|||
# backported
|
||||
Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
|
||||
Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
|
||||
# TODO investigate these
|
||||
Patch5: 0001-aarch64-failing-here.patch
|
||||
# backported fix
|
||||
# https://gerrit.libreoffice.org/c/core/+/153386/2#message-06ee95be419a14ee8f08035142b5718e0377d120
|
||||
Patch6: 0001-cui-fix-without-java-build.patch
|
||||
Patch7: 0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch
|
||||
|
||||
# backported
|
||||
Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
|
||||
Patch6: limit-tests-giving-dubious-results-to-x86_64.patch
|
||||
# not upstreamed
|
||||
# fix FTB in ppc64le from sharkcz
|
||||
# https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
|
||||
Patch11: lo-7.6-ppc64le-tests.patch
|
||||
Patch500: 0001-disable-libe-book-support.patch
|
||||
# https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
|
||||
Patch501: kahansum_test_fix_for_aarc64_s390x.patch
|
||||
|
||||
# Parches para CentOS 9
|
||||
# ICE
|
||||
|
|
@ -333,7 +340,7 @@ Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts
|
|||
Requires: %{name}-langpack-en = %{epoch}:%{version}-%{release}
|
||||
%ifarch %{java_arches}
|
||||
# rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
|
||||
Requires: java-headless >= 1:1.6
|
||||
Recommends: java-headless >= 1:1.6
|
||||
%else
|
||||
Obsoletes: libreoffice-nlpsolver < 1:7.4.0.0
|
||||
Obsoletes: libreoffice-officebean < 1:7.4.0.0
|
||||
|
|
@ -366,6 +373,9 @@ Summary: Database front-end for LibreOffice
|
|||
%if 0%{?fedora}
|
||||
Requires: firebird
|
||||
%endif
|
||||
%ifarch %{java_arches}
|
||||
Requires: java-headless >= 1:1.6
|
||||
%endif
|
||||
Requires: pentaho-reporting-flow-engine
|
||||
Requires: postgresql-jdbc
|
||||
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -999,11 +1009,6 @@ gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4}
|
|||
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4
|
||||
rm -rf git-hooks */git-hooks
|
||||
|
||||
# This is normally done by %%autosetup -S git_am,
|
||||
# but that does not work with multiple -b options, so we use plain %%setup above
|
||||
%global __scm git_am
|
||||
%__scm_setup_git_am -q
|
||||
|
||||
#Customize Palette to add Red Hat colours
|
||||
(head -n -1 extras/source/palettes/standard.soc && \
|
||||
echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
|
||||
|
|
@ -1013,53 +1018,44 @@ rm -rf git-hooks */git-hooks
|
|||
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
|
||||
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
|
||||
mv -f redhat.soc extras/source/palettes/standard.soc
|
||||
git commit -q -m 'add Red Hat colors to palette' extras/source/palettes/standard.soc
|
||||
|
||||
# apply patches
|
||||
%autopatch -M 99
|
||||
%autopatch -p1 -M 99
|
||||
%if 0%{?rhel}
|
||||
%patch500 -p1
|
||||
%endif
|
||||
|
||||
sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le
|
||||
sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk # aarch64/ppc64*/s390x
|
||||
sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk # ppc64*
|
||||
sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk # aarch64/ppc64*
|
||||
sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # ppc64le
|
||||
sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # ppc64le
|
||||
sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk # s390x
|
||||
|
||||
#see rhbz#2072615
|
||||
git rm vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
|
||||
|
||||
%if 0%{?rhel}
|
||||
# Pruebas unitarias que fallaban en CentOS 8
|
||||
#sed -i -e /CppunitTest_i18nlangtag_test_languagetag/d i18nlangtag/Module_i18nlangtag.mk
|
||||
#sed -i -e /CppunitTest_i18npool_test_breakiterator/d i18npool/Module_i18npool.mk
|
||||
#sed -i -e /CppunitTest_vcl_text/d vcl/Module_vcl.mk
|
||||
#sed -i -e /CppunitTest_writerperfect_writer/d writerperfect/Module_writerperfect.mk
|
||||
# Pruebas unitarias que fallaban en 7.4.6
|
||||
#sed -i -e /CppunitTest_dbaccess_dialog_save/d dbaccess/Module_dbaccess.mk
|
||||
#sed -i -e /CppunitTest_dbaccess_empty_stdlib_save/d dbaccess/Module_dbaccess.mk
|
||||
sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk
|
||||
sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk
|
||||
# Pruebas unitarias que fallaban en 7.5.0
|
||||
sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
|
||||
# Pruebas unitarias que fallaban en 7.5.1
|
||||
sed -i -e /CppunitTest_sw_layoutwriter2/d sw/Module_sw.mk
|
||||
# Pruebas unitarias que fallan en la 7.5.5
|
||||
sed -i -e /CppunitTest_sw_layoutwriter/d sw/Module_sw.mk
|
||||
# Pruebas unitarias que fallan en la 7.6.0
|
||||
sed -i -e /CppunitTest_sc_tiledrendering/d sc/Module_sc.mk
|
||||
sed -i -e /CppunitTest_sc_ucalc_formula\\s/d sc/Module_sc.mk
|
||||
%ifarch aarch64 s390x
|
||||
%patch501 -p1
|
||||
%endif
|
||||
|
||||
git commit -q -a -m 'temporarily disable failing tests'
|
||||
# Temporarily disable failing tests
|
||||
%ifarch ppc64le
|
||||
sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
|
||||
sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
|
||||
sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk
|
||||
sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
|
||||
sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
|
||||
sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
|
||||
%endif
|
||||
%ifarch aarch64
|
||||
# Nothing to do
|
||||
%endif
|
||||
%ifarch s390x
|
||||
sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
|
||||
sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
|
||||
sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
|
||||
# https://bugs.documentfoundation.org/show_bug.cgi?id=125978
|
||||
sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
|
||||
# failing testTdf149402_vba
|
||||
sed -i -e s/CppunitTest_basic_macros// basic/Module_basic.mk
|
||||
# Other test exclusions pointed out by sharkcz
|
||||
sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk
|
||||
sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
|
||||
%endif
|
||||
|
||||
# Seeing .git dir makes some of the build tools change their behavior.
|
||||
# We do not want that. Note: it is still possible to use
|
||||
# git --git-dir=.git-rpm
|
||||
mv .git .git-rpm
|
||||
#see rhbz#2072615
|
||||
rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
|
||||
|
||||
%build
|
||||
# path to external tarballs
|
||||
|
|
@ -1072,7 +1068,7 @@ for i in $RPM_OPT_FLAGS; do
|
|||
esac
|
||||
ARCH_FLAGS="$ARCH_FLAGS $i"
|
||||
done
|
||||
%ifarch s390 s390x %{arm} aarch64
|
||||
%ifarch s390 s390x %{arm}
|
||||
# these builders typically do not have enough memory to link the big libs with -g2
|
||||
ARCH_FLAGS="$ARCH_FLAGS -g1"
|
||||
%endif
|
||||
|
|
@ -1135,7 +1131,6 @@ touch autogen.lastrun
|
|||
--without-export-validation \
|
||||
--without-fonts \
|
||||
--without-lxml \
|
||||
--without-system-dragonbox \
|
||||
--without-system-libfixmath \
|
||||
--with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
|
||||
--with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
|
||||
|
|
@ -1149,12 +1144,9 @@ touch autogen.lastrun
|
|||
%{?archoptions} \
|
||||
%{?flatpakoptions}
|
||||
|
||||
if ! make verbose=true build; then
|
||||
if ! %make_build; then
|
||||
echo "build attempt 1 failed"
|
||||
if ! make verbose=true build; then
|
||||
echo "build attempt 2 failed"
|
||||
make verbose=true GMAKE_OPTIONS=-rj1 build
|
||||
fi
|
||||
make verbose=true build
|
||||
fi
|
||||
|
||||
#generate the icons and mime type stuff
|
||||
|
|
@ -1498,12 +1490,9 @@ export DESTDIR=%{buildroot}
|
|||
|
||||
%if 0%{?flatpak}
|
||||
# Assemble the libreoffice-*.appdata.xml files into a single
|
||||
# org.libreoffice.LibreOffice.appdata.xml; first create the single file:
|
||||
solenv/bin/assemble-flatpak-appdata-step1.sh \
|
||||
# org.libreoffice.LibreOffice.appdata.xml:
|
||||
solenv/bin/assemble-flatpak-appdata.sh \
|
||||
%{buildroot}%{_datadir}/metainfo/ 0
|
||||
# ...then append the original files to the single file:
|
||||
solenv/bin/assemble-flatpak-appdata-step2.sh \
|
||||
%{buildroot}%{_datadir}/metainfo/ %{buildroot}%{_datadir}/metainfo/
|
||||
rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml
|
||||
%endif
|
||||
|
||||
|
|
@ -1579,7 +1568,7 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
|
|||
%{baseinstdir}/program/libdeployment.so
|
||||
%{baseinstdir}/program/libdeploymentgui.so
|
||||
%{baseinstdir}/program/libdlgprovlo.so
|
||||
#{baseinstdir}/program/libexpwraplo.so
|
||||
#%%{baseinstdir}/program/libexpwraplo.so
|
||||
%{baseinstdir}/program/libfps_officelo.so
|
||||
%{baseinstdir}/program/gdbtrace
|
||||
%{baseinstdir}/program/gengal
|
||||
|
|
@ -2053,7 +2042,7 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
|
|||
%{baseinstdir}/program/impress.abignore
|
||||
%endif
|
||||
%{baseinstdir}/program/libPresentationMinimizerlo.so
|
||||
#{baseinstdir}/program/libPresenterScreenlo.so
|
||||
#%%{baseinstdir}/program/libPresenterScreenlo.so
|
||||
%{baseinstdir}/program/libwpftimpresslo.so
|
||||
%dir %{baseinstdir}/share/config/soffice.cfg/simpress
|
||||
%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml
|
||||
|
|
@ -2290,9 +2279,45 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Sun Oct 01 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.2.1-2
|
||||
- Add patch 501 for failing tests on aarc64 and s390x
|
||||
|
||||
* Sat Sep 30 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.2.1-1
|
||||
- 7.6.2.1
|
||||
|
||||
* Fri Sep 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.6.1.2-1
|
||||
- 7.6.1.2
|
||||
|
||||
* Mon Sep 04 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.1.1-2
|
||||
- Unbundle dragonbox
|
||||
|
||||
* Mon Aug 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.6.1.1-1
|
||||
- 7.6.1.1
|
||||
|
||||
* Sun Aug 27 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-4
|
||||
- Remove test exclusions from aarch64
|
||||
- Link aarch64 executable with standard -g level
|
||||
|
||||
* Wed Aug 23 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-3
|
||||
- Disable other failing tests under s390x
|
||||
- Add patch to fix FTB under ppc64le
|
||||
|
||||
* Mon Aug 21 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.6.0.3-1
|
||||
- 7.6.0.3 (versión release de libreoffice.org)
|
||||
|
||||
* Tue Aug 15 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-2
|
||||
- Disable unreliable test under s390x
|
||||
- Try verbose make if first build attempt fails
|
||||
|
||||
* Sun Aug 13 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-1
|
||||
- 7.6.0.3
|
||||
|
||||
* Wed Aug 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-2
|
||||
- Poppler rebuild.
|
||||
|
||||
* Mon Jul 31 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-1
|
||||
- 7.5.5.2
|
||||
|
||||
* Wed Jul 26 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.6.0.1-1
|
||||
- Subida de versión a la 7.6.0
|
||||
- Se removieron un par de parches que ya están aplicados en esta versión
|
||||
|
|
@ -2302,6 +2327,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
- Subida de versión a la 7.5.5
|
||||
- La prueba unitaria sw_layoutwriter truena. la dejo deshabilitada temporalmente
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.5.4.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 1:7.5.4.2-4
|
||||
- Rebuilt for ICU 73.2
|
||||
|
||||
* Tue Jun 20 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.4.2-6
|
||||
- Parche de pruebas initarias se pasó a sed -i en %setup
|
||||
- Se rehabilitaron algunas pruebas unitarias para CentOS 9
|
||||
|
|
@ -2309,6 +2340,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||
* Tue Jun 20 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.4.2-4
|
||||
- Compilar en CentOS 9
|
||||
|
||||
* Fri Jun 30 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1:7.5.4.2-3
|
||||
- Make Java optional. Fixes rhbz#2084071.
|
||||
|
||||
* Mon Jun 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:7.5.4.2-2
|
||||
- Backport upstream fix for testSignDocument_PEM_PDF test failure
|
||||
- Enable test again
|
||||
|
|
|
|||
1
Fedora-38
Symbolic link
1
Fedora-38
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
CentOS-9
|
||||
1
Fedora-39
Symbolic link
1
Fedora-39
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
CentOS-9
|
||||
Loading…
Reference in a new issue