strepsirrhini/libreoffice-compilar
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge 7.4.6.2.fc37

Browse source
This commit is contained in:
Sandino Araico Sanchez 2023-05-06 15:35:40 -06:00
commit ad0f66b2de
No known key found for this signature in database
GPG key ID: 90E64E484EED133A
1 changed files with 57 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
CentOS-9/SPECS/libreoffice.spec
View file

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
%global libo_version 7.4.2
%global libo_version 7.4.6
# 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.
@ -34,13 +34,6 @@
# effect
%bcond_without langpacks
# remove workdir at the end of %%build, to allow build on space-constrained machines
%ifarch s390 s390x
%bcond_without smallbuild
%else
%bcond_with smallbuild
%endif
# 'serverconfig' is tuned for non-interactive installs
# defaults off except on rhel for s390[x] and aarch64
%if 0%{?rhel}
@ -61,9 +54,19 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
Version: %{libo_version}.2
Release: 3%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
# icon-themes/karasa_jaga/COPYING: LGPLv3+
# icon-themes/colibre/COPYING-ICONS: CC0
# lotuswordpro is: Either LGPL 2.1 or SISSL 1.1
# wizards/source/access2base: Either MPLv2 or LGPLv3+
# writerperfect/source/common/DirectoryStream.cxx: MPLv2 or LGPLv2+
# extras/source/autocorr/lang/hr/license.md: GPL 2.0 or LGPL2 or MPLv1.1
# odk/examples/java/...: 3 clause BSD
License: MPL-2.0 AND Apache-2.0 AND LGPL-3.0-only AND LGPL-3.0-or-later AND CC0-1.0 AND BSD-3-Clause AND (LGPL-2.1-only OR SISSL) AND (MPL-2.0 OR LGPL-3.0-or-later) AND (MPL-2.0 OR LGPL-2.1-or-later) AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-only)
URL: http://www.libreoffice.org/
Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
@ -77,7 +80,7 @@ Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c31
Source8: libreoffice-multiliblauncher.sh
Source9: %{external_url}/dtoa-20180411.tgz
Source10: %{external_url}/dragonbox-1.1.0.tar.gz
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
#backwards compatability.
@ -112,6 +115,7 @@ BuildRequires: gettext
BuildRequires: git
BuildRequires: gnupg2
BuildRequires: gperf
BuildRequires: hunspell-en-US
BuildRequires: icu
BuildRequires: libtool-ltdl-devel
BuildRequires: make
@ -187,7 +191,7 @@ BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(poppler)
BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
# BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xmlsec1-nss)
@ -259,6 +263,10 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch
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-rhbz-2162658-backtrace-showing-endlessly-recursive-S.patch
Patch5: 0001-Related-rhbz-2136459-use-a-value-which-is-exactly-re.patch
Patch6: 0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch
Patch7: 0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch
# ICE
#Patch11: 0001-workaround-x86-ICE-with-gcc-12.patch
@ -1043,16 +1051,9 @@ for i in $RPM_OPT_FLAGS; do
case "$i" in
-pipe|-Wall|-Werror*|-fexceptions) continue;;
esac
%ifarch s390x
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106355
case "$i" in
-O2|-Wp,-D_FORTIFY_SOURCE=2)
continue;;
esac
%endif
ARCH_FLAGS="$ARCH_FLAGS $i"
done
%ifarch s390 %{arm} aarch64
%ifarch s390 s390x %{arm} aarch64
# these builders typically do not have enough memory to link the big libs with -g2
ARCH_FLAGS="$ARCH_FLAGS -g1"
%endif
@ -1117,6 +1118,7 @@ touch autogen.lastrun
--without-lxml \
--without-system-dragonbox \
--without-system-libfixmath \
--without-system-sane \
--with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
--with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
--enable-python=system \
@ -1153,14 +1155,11 @@ mkdir $WORKDIR/os-integration
cp -pr $WORKDIR/CustomTarget/sysui/share/output/usr/share/* $WORKDIR/os-integration
cp -pr $WORKDIR/CustomTarget/sysui/share/libreoffice/LOKDocView-%{girapiversion}.* $WORKDIR/os-integration
%if %{with smallbuild}
# remove the biggest offenders
# NOTE: not removing complete LinkTarget, as some libs are needed for smoketest
rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/LinkTarget/CppunitTest
%endif
%install
# remove workdir before install, to allow build on space-constrained machines
# remove the biggest offenders
rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/LinkTarget
# TODO investigate use of make distro-pack-install
#figure out the icon version
. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
@ -2297,6 +2296,36 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Wed Mar 22 2023 Stephan Bergmann <sbergman@redhat.com> - 1:7.4.6.2-2
- Resolves: rhbz#2171265 Failure to start with junk in program/services/
* Thu Mar 09 2023 Caolán McNamara <caolanm@redhat.com> - 1:7.4.6.2-1
- 7.4.6 release
- Related: rhbz#2177181 add --without-system-sane as a workaround
* Thu Jan 26 2023 Caolán McNamara <caolanm@redhat.com> - 1:7.4.5.1-1
- 7.4.5 release
* Sat Jan 21 2023 Caolán McNamara <caolanm@redhat.com> - 1:7.4.4.2-1
- 7.4.4 release
- Resolves: rhbz#2162658 ScInputWindow::Resize() crash
- Resolves: rhbz#2162862 null pFrame during teardown
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 1:7.4.3.2-4
- Rebuild for ICU 72
* Fri Dec 16 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.4.3.2-3
- fix License syntax "and/or" -> "AND/OR"
* Tue Dec 06 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.4.3.2-2
- add BuildRequires on hunspell-en-US for testTdf124603
* Thu Nov 17 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.4.3.2-1
- 7.4.3 release
* Thu Nov 17 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.4.2.3-2
- Resolves: rhbz#2143431 fix autofilter missing search entry
* Tue Oct 25 2022 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.4.2.3-2
- compile on CentOS 9