pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 962696 from LibreOffice:7.3

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/962696
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1001
This commit is contained in:
Danilo Spinella 2022-03-18 13:20:24 +00:00 committed by Git OBS Bridge
parent e1e4a82ff6
commit a0e5bbee14
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libreoffice.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 17 10:10:22 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update gpgme minimum version
- Only use curl tarball when needed
- Remove wrong comment
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 14 10:38:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com> Mon Mar 14 10:38:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>

5
libreoffice.spec
View File

@ -34,7 +34,6 @@
%else %else
%bcond_with kdeintegration %bcond_with kdeintegration
%endif %endif
# Use bundled gpgme on SLE-15-SP3 onwards
# Use system gpgme on TW and SLE15-SP4 or newer # Use system gpgme on TW and SLE15-SP4 or newer
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
%bcond_without system_gpgme %bcond_without system_gpgme
@ -95,7 +94,6 @@ Source2009: %{external_url}/dtoa-20180411.tgz
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way # Skia is part of chromium and bundled everywhere as by google only way is monorepo way
Source2010: %{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz Source2010: %{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
Source2012: %{external_url}/libcmis-0.5.2.tar.xz Source2012: %{external_url}/libcmis-0.5.2.tar.xz
Source2013: %{external_url}/curl-7.79.1.tar.xz
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build # to avoid BerkleyDB incompatibility with the plain build
Patch1: scp2-user-config-suse.diff Patch1: scp2-user-config-suse.diff
@ -126,6 +124,7 @@ BuildRequires: commons-logging
BuildRequires: cups-devel BuildRequires: cups-devel
# Use bundled curl on SLE-12-SP5 # Use bundled curl on SLE-12-SP5
%if 0%{suse_version} >= 1500 %if 0%{suse_version} >= 1500
Source2013: %{external_url}/curl-7.79.1.tar.xz
BuildRequires: curl-devel >= 7.68.0 BuildRequires: curl-devel >= 7.68.0
%endif %endif
# Needed for tests # Needed for tests
@ -314,7 +313,7 @@ BuildConflicts: java-headless < 9
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
%endif %endif
%if %{with system_gpgme} %if %{with system_gpgme}
BuildRequires: libgpgmepp-devel BuildRequires: libgpgmepp-devel >= 1.14
%endif %endif
%if %{with firebird} %if %{with firebird}
BuildRequires: pkgconfig(fbclient) BuildRequires: pkgconfig(fbclient)