update to 6.0.0 beta2

f41
David Tardon 7 years ago
parent d8bff6cf94
commit d694a438dc

10
.gitignore vendored

@ -12,13 +12,13 @@
/harfbuzz-1.7.0.tar.bz2 /harfbuzz-1.7.0.tar.bz2
/libassuan-2.4.3.tar.bz2 /libassuan-2.4.3.tar.bz2
/libcmis-0.5.1.tar.gz /libcmis-0.5.1.tar.gz
/libepubgen-0.0.1.tar.bz2 /libepubgen-0.1.0.tar.bz2
/libgpg-error-1.27.tar.bz2 /libgpg-error-1.27.tar.bz2
/liborcus-0.13.1.tar.gz /liborcus-0.13.1.tar.gz
/libqxp-0.0.0.tar.xz /libqxp-0.0.0.tar.xz
/libpagemaker-0.0.3.tar.bz2 /libpagemaker-0.0.3.tar.bz2
/libstaroffice-0.0.5.tar.xz /libstaroffice-0.0.5.tar.xz
/libwps-0.4.7.tar.xz /libwps-0.4.8.tar.xz
/libzmf-0.0.2.tar.xz /libzmf-0.0.2.tar.xz
/mdds-1.3.1.tar.bz2 /mdds-1.3.1.tar.bz2
/xmlsec1-1.2.25.tar.gz /xmlsec1-1.2.25.tar.gz
@ -52,3 +52,9 @@
/libreoffice-help-6.0.0.0.beta1.tar.xz.asc /libreoffice-help-6.0.0.0.beta1.tar.xz.asc
/libreoffice-translations-6.0.0.0.beta1.tar.xz /libreoffice-translations-6.0.0.0.beta1.tar.xz
/libreoffice-translations-6.0.0.0.beta1.tar.xz.asc /libreoffice-translations-6.0.0.0.beta1.tar.xz.asc
/libreoffice-6.0.0.0.beta2.tar.xz
/libreoffice-6.0.0.0.beta2.tar.xz.asc
/libreoffice-help-6.0.0.0.beta2.tar.xz
/libreoffice-help-6.0.0.0.beta2.tar.xz.asc
/libreoffice-translations-6.0.0.0.beta2.tar.xz
/libreoffice-translations-6.0.0.0.beta2.tar.xz.asc

File diff suppressed because it is too large Load Diff

@ -3,7 +3,7 @@
# Should contain .alphaX / .betaX, if this is pre-release (actually # Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names, # 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. # so we need a way to define it easily at one place.
%global libo_prerelease .beta1 %global libo_prerelease .beta2
# Should contain any suffix of release tarball name, e.g., -buildfix1. # Should contain any suffix of release tarball name, e.g., -buildfix1.
%global libo_buildfix %{nil} %global libo_buildfix %{nil}
# rhbz#715152 state vendor # rhbz#715152 state vendor
@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.0 Version: %{libo_version}.0
Release: 7%{?libo_prerelease}%{?dist} Release: 8%{?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 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/ URL: http://www.libreoffice.org/
@ -99,7 +99,7 @@ Source100: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.
Source101: %{external_url}/liborcus-0.13.1.tar.xz Source101: %{external_url}/liborcus-0.13.1.tar.xz
Source102: %{external_url}/mdds-1.3.1.tar.bz2 Source102: %{external_url}/mdds-1.3.1.tar.bz2
Source103: %{external_url}/libcmis-0.5.1.tar.gz Source103: %{external_url}/libcmis-0.5.1.tar.gz
Source104: %{external_url}/libwps-0.4.7.tar.xz Source104: %{external_url}/libwps-0.4.8.tar.xz
Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2 Source105: %{external_url}/libpagemaker-0.0.3.tar.bz2
Source106: %{external_url}/libzmf-0.0.2.tar.xz Source106: %{external_url}/libzmf-0.0.2.tar.xz
Source107: %{external_url}/libstaroffice-0.0.5.tar.xz Source107: %{external_url}/libstaroffice-0.0.5.tar.xz
@ -110,7 +110,7 @@ Source111: %{external_url}/libgpg-error-1.27.tar.bz2
Source112: %{external_url}/libassuan-2.4.3.tar.bz2 Source112: %{external_url}/libassuan-2.4.3.tar.bz2
Source113: %{external_url}/cppunit-1.14.0.tar.gz Source113: %{external_url}/cppunit-1.14.0.tar.gz
Source114: %{external_url}/libqxp-0.0.0.tar.xz Source114: %{external_url}/libqxp-0.0.0.tar.xz
Source115: %{external_url}/libepubgen-0.0.1.tar.bz2 Source115: %{external_url}/libepubgen-0.1.0.tar.bz2
%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit --without-system-libqxp --without-system-libepubgen %global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libpagemaker --without-system-libzmf --without-system-libstaroffice --without-system-harfbuzz --without-system-graphite --without-system-gpgmepp --without-system-cppunit --without-system-libqxp --without-system-libepubgen
Provides: bundled(gpgme) = 1.9.0 Provides: bundled(gpgme) = 1.9.0
@ -118,7 +118,7 @@ Provides: bundled(graphite2) = 1.3.10
Provides: bundled(harfbuzz) = 1.7.0 Provides: bundled(harfbuzz) = 1.7.0
Provides: bundled(libassuan) = 2.4.3 Provides: bundled(libassuan) = 2.4.3
Provides: bundled(libcmis) = 0.5.1 Provides: bundled(libcmis) = 0.5.1
Provides: bundled(libepubgen) = 0.0.1 Provides: bundled(libepubgen) = 0.1.0
Provides: bundled(libgpg-error) = 1.27 Provides: bundled(libgpg-error) = 1.27
Provides: bundled(liborcus) = 0.13.1 Provides: bundled(liborcus) = 0.13.1
Provides: bundled(libpagemaker) = 0.0.3 Provides: bundled(libpagemaker) = 0.0.3
@ -227,7 +227,7 @@ BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(libcmis-0.5) BuildRequires: pkgconfig(libcmis-0.5)
BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libe-book-0.1)
BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libeot)
BuildRequires: pkgconfig(libepubgen-0.0) BuildRequires: pkgconfig(libepubgen-0.1)
BuildRequires: pkgconfig(liborcus-0.13) BuildRequires: pkgconfig(liborcus-0.13)
BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(libqxp-0.0)
@ -268,8 +268,8 @@ Patch1: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# not upstreamed # not upstreamed
Patch3: 0001-gtk3-only-for-3.20.patch Patch3: 0001-gtk3-only-for-3.20.patch
Patch4: 0001-fix-includes-in-aarch64-bridge.patch Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
Patch5: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch Patch5: 0001-external-upload-libepubgen-0.1.0.patch
%if 0%{?rhel} %if 0%{?rhel}
# not upstreamed # not upstreamed
@ -2262,6 +2262,9 @@ done
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Thu Dec 14 2017 David Tardon <dtardon@redhat.com> - 1:6.0.0.0-8.beta2
- update to 6.0.0 beta2
* Mon Dec 04 2017 Caolán McNamara <caolanm@redhat.com> - 1:6.0.0.0-7.beta1 * Mon Dec 04 2017 Caolán McNamara <caolanm@redhat.com> - 1:6.0.0.0-7.beta1
- Rebuild for hunspell 1.6.2 - Rebuild for hunspell 1.6.2

@ -6,9 +6,9 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6 SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
SHA512 (libreoffice-6.0.0.0.beta1.tar.xz) = 7b8b99e1d79789422f5c6e89a87c91a3d7052b310d770dff4228bd8e2ab4d083e7b8a7de22b9d185ad7b58ab2bd731c8129fc138b7c187ab86f532dc9450f2e9 SHA512 (libreoffice-6.0.0.0.beta2.tar.xz) = a34d72db2dd4e821a0f9693687552706a07f457c02b903e8054d8bdab1801c1cf77c8a94d26211d5d34582c918895be668e9df46e15a4b80c97863269c1a3aa9
SHA512 (libreoffice-6.0.0.0.beta1.tar.xz.asc) = 50d1dfefb1308a160406b83d93853ea95fe01847fcdc6557833a0b7a8293989885247d8cb56b46837de11593ebf52a6e2be8970223c159d0030491d5c17bd190 SHA512 (libreoffice-6.0.0.0.beta2.tar.xz.asc) = 50c5ada5ffaa1a4e19287ec11ef62cb576aceaef61f632a0cc3fd522bc36c00acc6b1d700f74a4307badf92b75b9a86c0ee6c57eceb02fb8f4afc719d2783d2c
SHA512 (libreoffice-help-6.0.0.0.beta1.tar.xz) = b01ac4e2b181b793d9dbb6183e6a1c76e37c8154295bd0c001d181d7d75977153bcefd10ac5c9b3d82e1008c9906493046098fa64e2353cc4412cfd5c498680d SHA512 (libreoffice-help-6.0.0.0.beta2.tar.xz) = d07e8503ff68fe02193a8ace18d8a7b4e4d7f85a63208e74bdb8a18659c7e2b132fbb0673a1d8ebfbd166064eca06183b73159e260bcc8b3a4fba517a552685d
SHA512 (libreoffice-help-6.0.0.0.beta1.tar.xz.asc) = dc178afd614a5774b6ab8b8b1c7dd71165278aa87d0438d76ddc6afd1b9f2949100226fae29f729a15e5fafe4ac919bb7f4e47245c6a32db811800467d6990e5 SHA512 (libreoffice-help-6.0.0.0.beta2.tar.xz.asc) = 42590087fdc8c64f35dc6eb21c4a5643baa34fce6173ee438accfedcf6cd5a092ec70758fc67d139be77e30bbc0ab40292b427a9675367d251cb8aa0fa3bef4a
SHA512 (libreoffice-translations-6.0.0.0.beta1.tar.xz) = 50f33269ba46b8dd9c8179a3745b0f31c482f26b3c5a1e84f5373d8070e6ff1704e75458348dbe8ad001f797e1f0d9e6571dcda745332f10805344d5d123b3b8 SHA512 (libreoffice-translations-6.0.0.0.beta2.tar.xz) = 8e66f22e08eb85cc07cc6bd5bd616ea74d177792bb176f12214c1902580469097cb34138f71cf64948e3854f76398f46e92e193b2f91693164c5e9bcd6f9a5c7
SHA512 (libreoffice-translations-6.0.0.0.beta1.tar.xz.asc) = f91f31f360c1659174799d68bca82e765a69f3e068a4881175270998f2bfc0646de333120312803ad1d8e9ab841fbf849bd09f65857cec69db58a52e48b0fda1 SHA512 (libreoffice-translations-6.0.0.0.beta2.tar.xz.asc) = acd6305750d07b9aa80dc880da43657a7bfe787f71173d4223b1fbacbde101c4b1a643a12460a59ecc5d708f271564d1c1c930b025b44c24834a33a8b25ed42c

Loading…
Cancel
Save