Accepting request 593178 from LibreOffice:Factory

- Update to 6.0.3.2 fate#324870:
  * Final 6.0.3 tag for release

- Version update to 5.4.5.1:
  * Various fuzzying fixes/etc
  * Fixes data exposure bsc#1080249 CVE-2018-1055

- Version update to 5.4.4.2:
  * Proper release containing few additional fuzzing fixes

- Version update to 5.4.4.1:
  * Various fixes on 5.4 branch

OBS-URL: https://build.opensuse.org/request/show/593178
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=152
This commit is contained in:
Dominique Leuenberger 2018-04-05 13:28:27 +00:00 committed by Git OBS Bridge
commit a384809704
8 changed files with 47 additions and 26 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e7080e1ab540a8862bcde2a7502a8e4f8dc3f9b52a16748bf973f596ab23a48
size 203747340

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12b8a2f57d797ad51b7661e2302babfe73c0d23b52ddac9f4c7eb1b82472859b
size 203747760

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea57a525470be8ad30c818b421d4a5307b6a0d3fc1acca91f10ae2f65e5b96eb
size 2973176

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06999eac776c4fcf7339732bf988d2b85b7193283d4be622f848706e278e4701
size 2972952

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c19a7b661f22662669f685e768279321e0cb4078ab3e455b11e32fe4b253fb6f
size 139130268

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8aa651266b701b17e78aaca77db394bec3da07faf62546496484c63dd519a5b3
size 139138536

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 3 09:18:42 UTC 2018 - tchvatal@suse.com
- Update to 6.0.3.2 fate#324870:
* Final 6.0.3 tag for release
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 26 12:23:45 UTC 2018 - tchvatal@suse.com Mon Mar 26 12:23:45 UTC 2018 - tchvatal@suse.com
@ -103,6 +109,13 @@ Fri Feb 9 11:59:11 UTC 2018 - tchvatal@suse.com
- Bump the version of libgpg-error - Bump the version of libgpg-error
- Drop the libreoffice-poppler-0.62.patch merged upstream - Drop the libreoffice-poppler-0.62.patch merged upstream
-------------------------------------------------------------------
Fri Feb 9 11:57:46 UTC 2018 - tchvatal@suse.com
- Version update to 5.4.5.1:
* Various fuzzying fixes/etc
* Fixes data exposure bsc#1080249 CVE-2018-1055
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 2 11:30:20 UTC 2018 - tchvatal@suse.com Fri Feb 2 11:30:20 UTC 2018 - tchvatal@suse.com
@ -169,6 +182,12 @@ Wed Dec 20 20:03:58 UTC 2017 - tchvatal@suse.com
- Version update to 6.0.0.1: - Version update to 6.0.0.1:
* RC1 of 6 series, now tests seem to pass * RC1 of 6 series, now tests seem to pass
-------------------------------------------------------------------
Wed Dec 13 12:25:38 UTC 2017 - tchvatal@suse.com
- Version update to 5.4.4.2:
* Proper release containing few additional fuzzing fixes
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 12 08:52:45 UTC 2017 - tchvatal@suse.com Tue Dec 12 08:52:45 UTC 2017 - tchvatal@suse.com
@ -186,6 +205,12 @@ Mon Dec 11 12:09:26 UTC 2017 - tchvatal@suse.com
- Fix providing libgpg-error0 bsc#1072061 when bundling - Fix providing libgpg-error0 bsc#1072061 when bundling
-------------------------------------------------------------------
Mon Dec 11 10:19:31 UTC 2017 - tchvatal@suse.com
- Version update to 5.4.4.1:
* Various fixes on 5.4 branch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 8 09:42:28 UTC 2017 - tchvatal@suse.com Fri Dec 8 09:42:28 UTC 2017 - tchvatal@suse.com

View File

@ -22,15 +22,15 @@
%define numbertext_version 0.9.5 %define numbertext_version 0.9.5
# Urls # Urls
%define external_url http://dev-www.libreoffice.org/src/ %define external_url http://dev-www.libreoffice.org/src/
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.2 %define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.3
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/ #%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
# Enable the kde integration on openSUSE only # Enable the kde integration on openSUSE only
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
%bcond_without kdeintegration %bcond_without kdeintegration
%else %else
%bcond_with kdeintegration %bcond_with kdeintegration
%endif %endif
%if 0%{?suse_version} > 1320 && %{?is_opensuse} %if 0%{?suse_version} > 1320 && 0%{?is_opensuse}
%bcond_without firebird %bcond_without firebird
%else %else
%bcond_with firebird %bcond_with firebird
@ -46,12 +46,12 @@
%bcond_with system_gpgme %bcond_with system_gpgme
%endif %endif
Name: libreoffice Name: libreoffice
Version: 6.0.3.1 Version: 6.0.3.2
Release: 0 Release: 0
Summary: A Free Office Suite (Framework) 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 Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ URL: http://www.documentfoundation.org/
Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source0: %{tarball_url}/libreoffice-%{version}.tar.xz
Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz
Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz
@ -124,14 +124,10 @@ BuildRequires: java-devel >= 1.6
BuildRequires: junit4 BuildRequires: junit4
BuildRequires: libbase BuildRequires: libbase
BuildRequires: libcppunit-devel >= 1.14.0 BuildRequires: libcppunit-devel >= 1.14.0
BuildRequires: liberation-fonts
BuildRequires: libexif BuildRequires: libexif
BuildRequires: libfonts BuildRequires: libfonts
BuildRequires: libformula BuildRequires: libformula
%if %{with system_gpgme}
BuildRequires: libgpgmepp-devel
%else
BuildRequires: chrpath
%endif
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: liblayout BuildRequires: liblayout
BuildRequires: libloader BuildRequires: libloader
@ -215,10 +211,10 @@ BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends) BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24 BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24
BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xt)
Requires: libreoffice-branding >= 6.0
Requires: libreoffice-icon-themes = %{version}
# We need at least english to launch ourselves. # We need at least english to launch ourselves.
Requires: liberation-fonts Requires: liberation-fonts
Requires: libreoffice-branding >= 6.0
Requires: libreoffice-icon-themes = %{version}
Requires: libreoffice-l10n-en = %{version} Requires: libreoffice-l10n-en = %{version}
Requires: python3 Requires: python3
Requires(post): update-desktop-files Requires(post): update-desktop-files
@ -244,6 +240,11 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version} Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x
%if %{with system_gpgme}
BuildRequires: libgpgmepp-devel
%else
BuildRequires: chrpath
%endif
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_date_time-devel BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel BuildRequires: libboost_filesystem-devel
@ -253,7 +254,6 @@ BuildRequires: libboost_system-devel
%else %else
BuildRequires: boost-devel BuildRequires: boost-devel
%endif %endif
BuildRequires: liberation-fonts
%if %{with firebird} %if %{with firebird}
BuildRequires: pkgconfig(fbclient) BuildRequires: pkgconfig(fbclient)
%endif %endif
@ -671,7 +671,6 @@ for lang in %{*}; do \
done \ done \
} \ } \
%{!?-l:%{error:-l must be present}} %{!?-l:%{error:-l must be present}}
# Symlinking macro for /usr/lib64 and /usr/share packing # Symlinking macro for /usr/lib64 and /usr/share packing
# As argument takes name of the package # As argument takes name of the package
%define _link_noarch_files() \ %define _link_noarch_files() \
@ -687,7 +686,6 @@ if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -x %{_bindir}/lib
rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \ rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \
fi \ fi \
%{nil} %{nil}
# Crazy magic for the auto help/lang generating. # Crazy magic for the auto help/lang generating.
# Inspired and adjusted from Fedora spec. # Inspired and adjusted from Fedora spec.
%define _langpack_common(g:l:j:) \ %define _langpack_common(g:l:j:) \
@ -707,7 +705,6 @@ fi \
%dir %{_datadir}/%{name}/share/wizards \ %dir %{_datadir}/%{name}/share/wizards \
%{_datadir}/%{name}/share/wizards/resources_%{-j:%{-j*}}%{!-j:%{-l*}}.properties \ %{_datadir}/%{name}/share/wizards/resources_%{-j:%{-j*}}%{!-j:%{-l*}}.properties \
%{nil} %{nil}
# Defines a language pack subpackage. # Defines a language pack subpackage.
# #
# It's necessary to define language code (-l) and language name (-n). # It's necessary to define language code (-l) and language name (-n).
@ -802,7 +799,6 @@ Provides additional %{langname} translations and resources for %{project}. \
\ \
%{expand:%%_link_noarch_files %{pkgname}} \ %{expand:%%_link_noarch_files %{pkgname}} \
%{nil} %{nil}
%langpack -l af -n Afrikaans -m af_ZA %langpack -l af -n Afrikaans -m af_ZA
%langpack -l ar -n Arabic -s ctl -m ar %langpack -l ar -n Arabic -s ctl -m ar
%langpack -l as -n Assamese %langpack -l as -n Assamese