The package rpms/libreoffice.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=e5d76c....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit 6f0c589d7a4dd0541b2fcc322226c02b0c93a412
Merge: ad69b41 8f1a5fd
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Thu Oct 7 14:07:47 2021 +0100
Merge branch 'rawhide' into f35
commit 8f1a5fd2b5ba495c15dfe5e68b93768d820de085
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Thu Oct 7 14:05:34 2021 +0100
upgrade to 7.2.2 (likely will fix rhbz#2011384)
diff --git a/.gitignore b/.gitignore
index 0a31852..c9fc227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,9 @@
/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
/libreoffice-multiliblauncher.sh
/dtoa-20180411.tgz
-/libreoffice-7.2.1.2.tar.xz
-/libreoffice-7.2.1.2.tar.xz.asc
-/libreoffice-help-7.2.1.2.tar.xz
-/libreoffice-help-7.2.1.2.tar.xz.asc
-/libreoffice-translations-7.2.1.2.tar.xz
-/libreoffice-translations-7.2.1.2.tar.xz.asc
+/libreoffice-7.2.2.2.tar.xz
+/libreoffice-7.2.2.2.tar.xz.asc
+/libreoffice-help-7.2.2.2.tar.xz
+/libreoffice-help-7.2.2.2.tar.xz.asc
+/libreoffice-translations-7.2.2.2.tar.xz
+/libreoffice-translations-7.2.2.2.tar.xz.asc
diff --git a/libreoffice.spec b/libreoffice.spec
index c282fc6..fbab16d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.2.1
+%global libo_version 7.2.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.
@@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 4%{?libo_prerelease}%{?dist}
+Release: 1%{?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
URL:
http://www.libreoffice.org/
@@ -2246,6 +2246,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Thu Oct 07 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.2.2-1
+- upgrade to 7.2.2 (likely will fix rhbz#2011384)
+
* Tue Oct 05 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-4
- rhbz#2010520 move libroffice.jar to noarch java location
diff --git a/sources b/sources
index aaa414c..31ab514 100644
--- a/sources
+++ b/sources
@@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) =
b9c02d63e9b47a838d
SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) =
6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
SHA512 (libreoffice-multiliblauncher.sh) =
db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dtoa-20180411.tgz) =
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-SHA512 (libreoffice-7.2.1.2.tar.xz) =
f189ecb250675ded5a1147d1c0bbace54f28159d7bbee662479239f65f3e10ac64225f31abf95ced16e147bffe795296ac84e465b4651c00a64f4c4780009603
-SHA512 (libreoffice-7.2.1.2.tar.xz.asc) =
59a6b2a8fe8f42d4a9d8336131c8804087f92a6a8005bfd52de9969d9b20e503b15f7bd7261d18e02d3f876bf83ff9b009a4cae57a489472935da1d6412d2bac
-SHA512 (libreoffice-help-7.2.1.2.tar.xz) =
04419d18390fc3adcb61f57945fbdc9337206076baeff0af9d5f18fe4e477d99ca36640d9c6f160a5ab1ba28d4e92f0598cbe5991d6f6b2a61b51ff4fe7e41cd
-SHA512 (libreoffice-help-7.2.1.2.tar.xz.asc) =
bdbcec0491218e577c6089e11b4ddfafdd2aada2e36f4f86b1903ab933cf77e605358fa727f54b8b5dfa1ad41b0da49abe1d044ea185d17f2532332570740636
-SHA512 (libreoffice-translations-7.2.1.2.tar.xz) =
fb508ae6ba7c160ed5f47fd5f6ab2a127dbaa4fe6296c0d96b9c5436fc9dacd4ed2b586b63f660dca761f903c1b42c9a384c346b9629a5d54d0ff6e36346b65f
-SHA512 (libreoffice-translations-7.2.1.2.tar.xz.asc) =
62ba35c9638b685edd0d2d3674a94c73bfaf92a438dcffad62a3134640e8cc3222fc94c1afb80c9c1556270a57a7706850d97b15a35ad63138e1ae595e68dcb8
+SHA512 (libreoffice-7.2.2.2.tar.xz) =
9adc14aa2aa24e1e91b32f0663d3fed8421baf78c3d310e8cc52ae70ea338b9d58406344d22d2c2fa6f91f10ae91945ef2d5713036f9144705bdb4c19ad69ca7
+SHA512 (libreoffice-7.2.2.2.tar.xz.asc) =
229215280f6930136c793efaac9d0578068b1894b432119223f649bd888d68572b2b11d4ba6215939ebb1a71bdabc1fef8e07780e2d8a9fe1325acb2bcb3e21b
+SHA512 (libreoffice-help-7.2.2.2.tar.xz) =
1e3a250b68f591c0dc0cd5d57843baa370ed009faabc9446826e8207043af5d193a263b85b9443a2baf1cb64366d90d08b763adf9ec9865d256f760f847ea638
+SHA512 (libreoffice-help-7.2.2.2.tar.xz.asc) =
fac140c750a2504198ea5dce596e11043ad707b0d0de41dcfdd0a3f236232bcb160d0a4ca86b6610b0039215a6f4d27ea22b340e4d2a8f38a67642e6ff55a0dd
+SHA512 (libreoffice-translations-7.2.2.2.tar.xz) =
3bfda8085b7276104a949140098c56d0ceee054913bfd640961e74439529e729e4d73aed4e1c300ecfdc3f84820ca931f640b8f53b9270567adfead14055413b
+SHA512 (libreoffice-translations-7.2.2.2.tar.xz.asc) =
82b315ffcfcfe450d772dd9b933244ec90227f9016079cecb75af72b1ff5ac02643d95334c63bb3d67802df326ff98f5ac5f943e8b3cf406a19e98ce69e5a3db
commit e5d76cc52717db16bb07245b2a30a63623aea436
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Wed Oct 6 08:43:41 2021 +0100
undo armv7hl build workarounds, arm build seems to work again
diff --git a/libreoffice.spec b/libreoffice.spec
index 6615a09..c282fc6 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -983,10 +983,8 @@ 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
-
-%define _default_patch_flags --no-backup-if-mismatch -p1
+%global __scm git_am
+%__scm_setup_git_am
#Customize Palette to add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \
@@ -997,7 +995,7 @@ 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
+git commit -q -m 'add Red Hat colors to palette'
extras/source/palettes/standard.soc
# apply patches
%autopatch -M 99
@@ -1021,12 +1019,12 @@ sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk
sed -i -e /CustomTarget_uno_test/d testtools/Module_testtools.mk
%endif
-# git commit -q -a -m 'temporarily disable failing tests'
+git commit -q -a -m 'temporarily disable failing tests'
# 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
+mv .git .git-rpm
%build
# path to external tarballs
@@ -1074,10 +1072,6 @@ autoconf
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
-%ifarch armv7hl
-SMP_MFLAGS=2
-%endif
-
%if 0%{?flatpak}
%define flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar
--with-boost-libdir=%{_libdir} --with-external-dict-dir=/app/share/myspell
--with-external-hyph-dir=/app/share/hyphen --with-external-thes-dir=/app/share/mythes
--with-flute-jar=/app/share/java/flute.jar --with-jdk-home=/app/lib/jvm/java
--with-jfreereport-jar=/app/share/java/flow-engine.jar
--with-libbase-jar=/app/share/java/libbase.jar
--with-libfonts-jar=/app/share/java/libfonts.jar
--with-libformula-jar=/app/share/java/libformula.jar
--with-liblayout-jar=/app/share/java/liblayout.jar
--with-libloader-jar=/app/share/java/libloader.jar
--with-librepository-jar=/app/share/java/librepository.jar
--with-libserializer-jar=/app/share/java/libserializer.jar
--with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar
FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir}
%endif