automatic import of libreofficeopeneuler23.03openeuler22.09

1 files changed, 11 insertions, 7 deletions

diff --git a/libreoffice.spec b/libreoffice.spec
index 308aa33..730db1a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -10,9 +10,9 @@
 %bcond_with firebird
 Name:           libreoffice
 Version:        7.5.0.2
-Release:        2
+Release:        3
 Summary:        A Free Office Suite (Framework)
-License:        LGPL-3.0-or-later AND MPL-2.0+
+License:        LGPL-3.0-or-later AND MPL-2.0
 Group:          Productivity/Office/Suite
 URL:            https://www.documentfoundation.org/
 Source0:        %{tarball_url}/libreoffice-%{version}.tar.xz
@@ -56,11 +56,12 @@ Source2013:     %{external_url}/dragonbox-1.1.3.tar.gz
 Patch2:         nlpsolver-no-broken-help.diff
 Patch3:         mediawiki-no-broken-help.diff
 # Build with java 8
-Patch101:       0001-Revert-java-9-changes.patch
+#atch101:       0001-Revert-java-9-changes.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 # save time by relying on rpm check rather than doing stupid find+grep
 Patch991:       libreoffice-no-destdircheck.patch
+Patch996:       system-libxml-icu74.patch
 BuildRequires:  %{name}-share-linker
 BuildRequires:  ant
 BuildRequires:  autoconf
@@ -822,6 +823,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch3
 %patch990 -p1
 %patch991 -p1
+%patch996 -p1
 
 # Disable some of the failing tests (some are random)
 # Following two tests are really flaky
@@ -872,9 +874,9 @@ export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOL
 
 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
 # Note: For your own distribution, please get your own set of keys.
-google_api_key="AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q"
-google_default_client_id="4139804441.apps.googleusercontent.com"
-google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P"
+google_api_key=""
+google_default_client_id=""
+google_default_client_secret=""
 
 # do not run configure in autogen but use macro later
 export NOCONFIGURE=yes
@@ -967,7 +969,7 @@ make verbose=t build
 %check
 export LANG=C.UTF-8
 # Run tests only on x86_64 and aarch64 as they are resource hogs
-%ifarch x86_64 aarch64
+%ifarch %{java_arches}
 # safeguard jarfires that can get magically overriden by the make
 mkdir savejar
 cp %{buildroot}%{_libdir}/%{name}/program/classes/*.jar savejar/
@@ -1300,3 +1302,5 @@ exit 0
 %files -f file-lists/branding_upstream.txt branding-upstream
 
 %changelog
+* Fri Jan 5 2024 Eustace <eusteuc@outlook.com> - 7.5.0.2-3
+- Package init