- Start updating to release 6.0.0.0.beta1:

* Code for Qt5 UI
  * No longer flickering opengl backend
  * Tons of updates
  * Collada and gltf are removed upstream
  * Online help re-integrated even better

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=549
This commit is contained in:
Tomáš Chvátal 2017-11-29 12:24:57 +00:00 committed by Git OBS Bridge
parent 8e46e0bc80
commit b5b2cf6e67
8 changed files with 44 additions and 37 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Nov 29 11:55:23 UTC 2017 - tchvatal@suse.com
- Start updating to release 6.0.0.0.beta1:
* Code for Qt5 UI
* No longer flickering opengl backend
* Tons of updates
* Collada and gltf are removed upstream
* Online help re-integrated even better
-------------------------------------------------------------------
Sat Nov 18 18:42:01 UTC 2017 - tchvatal@suse.com

View File

@ -22,8 +22,8 @@
%define numbertext_version 0.9.5
# Urls
%define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.3
#%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.0
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
# Wether to enable the kde integration
%if 0%{?is_opensuse} && 0%{?suse_version} < 1330
%bcond_without kdeintegration
@ -41,7 +41,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 5.4.3.2
Version: 6.0.0.0.beta1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0+ and MPL-2.0+
@ -62,8 +62,6 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t
Source1000: %{external_url}/gpgme-1.8.0.tar.bz2
Source1001: %{external_url}/libgpg-error-1.26.tar.bz2
Source1002: %{external_url}/libassuan-2.4.3.tar.bz2
# This never had an release so just bundle it as per what other distros do
Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
# Internal bundled stuff we can't remove
# To build this we would pull cygwin; not worth it
Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@ -190,27 +188,28 @@ BuildRequires: pkgconfig(libclucene-core)
BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.0
BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1
BuildRequires: pkgconfig(libeot) >= 0.01
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.4
BuildRequires: pkgconfig(libepubgen-0.0)
BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.7
BuildRequires: pkgconfig(libexttextcat) >= 3.1.1
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(libgltf-0.1) >= 0.1.0
BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.11
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.13
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
BuildRequires: pkgconfig(liborcus-0.12)
BuildRequires: pkgconfig(liborcus-0.13)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libqxp-0.0)
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.3
BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.4
BuildRequires: pkgconfig(libvisio-0.1) >= 0.1
BuildRequires: pkgconfig(libwpd-0.10) >= 0.10
BuildRequires: pkgconfig(libwpg-0.3)
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.6
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.7
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libzmf-0.0)
BuildRequires: pkgconfig(mdds-1.2)
BuildRequires: pkgconfig(mdds-1.2) >= 1.2.3
BuildRequires: pkgconfig(mythes)
BuildRequires: pkgconfig(nspr) >= 4.8
BuildRequires: pkgconfig(nss) >= 3.9.3
@ -267,16 +266,13 @@ Recommends: liberation-fonts
%if %{with firebird}
BuildRequires: pkgconfig(fbclient)
%endif
%if 0%{?suse_version} == 1315
BuildRequires: openCOLLADA-devel
%else
BuildRequires: libopenCOLLADA-devel
%endif
%if %{with kdeintegration}
BuildRequires: libkde4-devel
BuildRequires: pkgconfig(Qt5Core)
%else
Provides: %{name}-kde4 = %{version}
Obsoletes: %{name}-kde4 < %{version}
Provides: %{name}-qt5 = %{version}
Obsoletes: %{name}-qt5 < %{version}
%endif
%description
@ -296,7 +292,7 @@ Some optional features are provided by extra packages, for example:
- libreoffice-mailmerge
- libreoffice-filters
- libreoffice-kde4
- libreoffice-qt5
- libreoffice-gnome
Non-English localizations are provided by extra packages as well, for
@ -566,13 +562,15 @@ Supplements: packageand(libreoffice:plasma5-workspace)
%description gtk3
This package contains Gtk3 interface rendering option for LibreOffice.
%package kde4
Summary: KDE4 Extensions for LibreOffice
%package qt5
Summary: Qt5 interface for LibreOffice
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Provides: %{name}-kde4 = %{version}
Obsoletes: %{name}-kde4 < %{version}
%description kde4
This package contains some KDE4 extensions for LibreOffice.
%description qt5
This package contains Qt5 interface rendering options for LibreOffice.
%package sdk
Summary: LibreOffice SDK
@ -1021,8 +1019,6 @@ export NOCONFIGURE=yes
--enable-gtk3 \
--enable-introspection \
--with-doxygen \
--enable-gltf \
--enable-collada --with-system-opencollada \
--enable-release-build \
--enable-split-app-modules \
--enable-split-opt-features \
@ -1042,10 +1038,11 @@ export NOCONFIGURE=yes
--without-help \
--without-export-validation \
--enable-odk \
%if %{with kdeintegration}
--enable-kde4 \
%else
--disable-kde4 \
%if %{with kdeintegration}
--enable-qt5 \
%else
--disable-qt5 \
%endif
%if %{with system_gpgme}
--with-system-gpgmepp \