- Version bump to 5.0.0.beta3:

* Drop merged patch 0001-Make-cpp-poppler-version.h-header-optional.patch
  * Update some internal tarballs so we keep building
    - based on these bumps update the buildrequires too

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=290

0001-Make-cpp-poppler-version.h-header-optional.patch

@@ -1,102 +0,0 @@
-From 459fe2262e26c3f24108e5ba1bdf342b6236cf54 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
-Date: Thu, 16 Apr 2015 10:13:06 +0200
-Subject: [PATCH] Make cpp/poppler-version.h header optional
-
-Older popler (SLE11) does not have this header yet.
-With the code simply if the header not found define version to oldest
-possible working candidate and also raise the .pc check to the same.
-
-Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c
----
- config_host/config_poppler.h.in                       | 10 ++++++++++
- configure.ac                                          |  9 ++++++---
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  8 ++++++++
- 3 files changed, 24 insertions(+), 3 deletions(-)
- create mode 100644 config_host/config_poppler.h.in
-
-diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in
-new file mode 100644
-index 0000000..458c49b
---- /dev/null
-+++ b/config_host/config_poppler.h.in
-@@ -0,0 +1,10 @@
-+/*
-+Settings for poppler header file dection
-+*/
-+
-+#ifndef CONFIG_POPPLER_H
-+#define CONFIG_POPPLER_H
-+
-+#define HAVE_POPPLER_VERSION_H 0
-+
-+#endif
-diff --git a/configure.ac b/configure.ac
-index 9e8e1d2..79effbe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
-     if test "$with_system_poppler" = "yes"; then
-         AC_MSG_RESULT([external])
-         SYSTEM_POPPLER=TRUE
--        PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
-+        PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
-         AC_LANG_PUSH([C++])
-         save_CXXFLAGS=$CXXFLAGS
-         save_CPPFLAGS=$CPPFLAGS
-         CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
-         CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
--        AC_CHECK_HEADER([cpp/poppler-version.h], [],
--                   [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
-+        AC_CHECK_HEADER([cpp/poppler-version.h],
-+            [AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)],
-+            [])
-         CXXFLAGS=$save_CXXFLAGS
-         CPPFLAGS=$save_CPPFLAGS
-         AC_LANG_POP([C++])
-@@ -10449,6 +10450,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
-         AC_MSG_RESULT([internal])
-         SYSTEM_POPPLER=
-         BUILD_TYPE="$BUILD_TYPE POPPLER"
-+        AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)
-     fi
- else
-     AC_MSG_RESULT([no])
-@@ -13002,6 +13004,7 @@ AC_CONFIG_HEADERS([config_host/config_vcl.h])
- AC_CONFIG_HEADERS([config_host/config_vclplug.h])
- AC_CONFIG_HEADERS([config_host/config_version.h])
- AC_CONFIG_HEADERS([config_host/config_oauth2.h])
-+AC_CONFIG_HEADERS([config_host/config_poppler.h])
- AC_OUTPUT
- 
- if test "$CROSS_COMPILING" = TRUE; then
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index d15491b..f4fa810 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -21,6 +21,7 @@
- #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
- 
- #include <sal/types.h>
-+#include <config_poppler.h>
- 
- #if defined __GNUC__
- # pragma GCC diagnostic push
-@@ -50,7 +51,14 @@
- class GfxPath;
- class GfxFont;
- class PDFDoc;
-+#if HAVE_POPPLER_VERSION_H
- #include <cpp/poppler-version.h>
-+#else
-+#define POPPLER_VERSION "0.12.3"
-+#define POPPLER_VERSION_MAJOR 0
-+#define POPPLER_VERSION_MINOR 12
-+#define POPPLER_VERSION_MICRO 3
-+#endif
- #define POPPLER_CHECK_VERSION(major,minor,micro) \
-   (POPPLER_VERSION_MAJOR > (major) || \
-    (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
--- 
-2.3.5
-

17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2

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

b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz

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

cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2

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

e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz

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

ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz

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

ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip

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

harfbuzz-0.9.23.tar.bz2

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

harfbuzz-0.9.40.tar.bz2

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

libetonyek-0.1.1.tar.bz2

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

libetonyek-0.1.2.tar.bz2

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

libmwaw-0.3.4.tar.bz2

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

libmwaw-0.3.5.tar.bz2

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

libodfgen-0.1.3.tar.bz2

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

libodfgen-0.1.4.tar.bz2

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

libreoffice-4.4.3.2.tar.xz

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

libreoffice-5.0.0.0.beta3.tar.xz

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

libreoffice-help-4.4.3.2.tar.xz

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

libreoffice-help-5.0.0.0.beta3.tar.xz

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

libreoffice-translations-4.4.3.2.tar.xz

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

libreoffice-translations-5.0.0.0.beta3.tar.xz

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

libreoffice.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Jun 13 13:23:20 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 5.0.0.beta3:
+  * Drop merged patch 0001-Make-cpp-poppler-version.h-header-optional.patch
+  * Update some internal tarballs so we keep building
+    - based on these bumps update the buildrequires too
+
 -------------------------------------------------------------------
 Wed Jun  3 12:08:54 UTC 2015 - tchvatal@suse.com
 

libreoffice.spec

@@ -23,7 +23,7 @@
 %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/4.4.3
+%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.0.0
 # Old Make and bundle or not
 %if 0%{?suse_version} > 1230
 %bcond_with oldmake
@@ -63,7 +63,7 @@
 %endif
 # This is used due to the need for beta releases
 Name:           libreoffice
-Version:        4.4.3.2
+Version:        5.0.0.0.beta3
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@@ -98,36 +98,36 @@ Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
 Source2006:     %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 Source2007:     %{external_url}/librevenge-0.0.2.tar.bz2
 Source2008:     %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-Source2009:     %{external_url}/libetonyek-0.1.1.tar.bz2
+Source2009:     %{external_url}/libetonyek-0.1.2.tar.bz2
 Source2010:     %{external_url}/libe-book-0.1.2.tar.bz2
 Source2011:     %{external_url}/libfreehand-0.1.0.tar.bz2
-Source2012:     %{external_url}/libodfgen-0.1.3.tar.bz2
+Source2012:     %{external_url}/libodfgen-0.1.4.tar.bz2
 Source2013:     %{external_url}/libcdr-0.1.1.tar.bz2
 Source2014:     %{external_url}/libmspub-0.1.2.tar.bz2
-Source2015:     %{external_url}/libmwaw-0.3.4.tar.bz2
+Source2015:     %{external_url}/libmwaw-0.3.5.tar.bz2
 Source2016:     %{external_url}/libpagemaker-0.0.2.tar.bz2
 Source2017:     %{external_url}/libvisio-0.1.1.tar.bz2
 Source2018:     %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
 Source2019:     %{external_url}/libwpd-0.10.0.tar.bz2
 Source2020:     %{external_url}/libwpg-0.3.0.tar.bz2
-Source2021:     %{external_url}/libwps-0.3.1.tar.bz2
+Source2021:     %{external_url}/libwps-0.4.0.tar.bz2
 Source2022:     %{external_url}/libabw-0.1.1.tar.bz2
 Source2023:     %{external_url}/lcms2-2.6.tar.gz
 Source2024:     %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-Source2025:     %{external_url}/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
+Source2025:     %{external_url}/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2
 Source2026:     %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
 Source2027:     %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 Source2028:     %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 Source2029:     %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
 Source2030:     %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
-Source2031:     %{external_url}/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
+Source2031:     %{external_url}/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
 Source2032:     %{external_url}/graphite2-1.2.4.tgz
 Source2033:     %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
-Source2034:     %{external_url}/harfbuzz-0.9.23.tar.bz2
+Source2034:     %{external_url}/harfbuzz-0.9.40.tar.bz2
 Source2035:     %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
 Source2036:     %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
 Source2037:     %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-Source2038:     %{external_url}/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+Source2038:     %{external_url}/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip
 Source2039:     %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source2040:     %{external_url}/Firebird-2.5.2.26540-0.tar.bz2
 Source2041:     %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
@@ -160,14 +160,12 @@ Source3000:     http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2
 Patch1:         scp2-user-config-suse.diff
 # pack new desktop files
 Patch2:         pack-desktop-files-for-optional-filters.diff
-# correctly bootstrap python stuff with system python (deb#501028, i#90701)
+# correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
 Patch3:         system-pyuno.diff
 # do not use the broken help; unopkg complained about it when registering extensions
 # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
 Patch4:         nlpsolver-no-broken-help.diff
 Patch5:         mediawiki-no-broken-help.diff
-# PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0
-Patch6:         0001-Make-cpp-poppler-version.h-header-optional.patch
 # PATCH-FIX-SUSE: do not declare java6 available for without system libs build
 Patch7:         0001-Make-HAVE_JAVA6-be-always-false.patch
 # try to save space by using hardlinks
@@ -271,7 +269,7 @@ BuildRequires:  libbase
 BuildRequires:  libcdr-devel >= 0.1
 BuildRequires:  libcmis-devel >= 0.5.0
 BuildRequires:  libe-book-devel >= 0.1.1
-BuildRequires:  libetonyek-devel >= 0.1.1
+BuildRequires:  libetonyek-devel >= 0.1.2
 BuildRequires:  libexif
 BuildRequires:  libexttextcat-devel >= 3.1.1
 BuildRequires:  libfbembed-devel
@@ -284,10 +282,10 @@ BuildRequires:  liblayout
 BuildRequires:  liblcms2-devel
 BuildRequires:  libloader
 BuildRequires:  libmspub-devel >= 0.1
-BuildRequires:  libmwaw-devel >= 0.3.4
+BuildRequires:  libmwaw-devel >= 0.3.5
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libmysqlcppconn-devel >= 1.0.6
-BuildRequires:  libodfgen-devel >= 0.1
+BuildRequires:  libodfgen-devel >= 0.1.4
 BuildRequires:  liborcus-devel >= 0.7.0
 BuildRequires:  libpagemaker-devel
 BuildRequires:  libredland-devel
@@ -298,11 +296,11 @@ BuildRequires:  libserializer
 BuildRequires:  libvisio-devel >= 0.1
 BuildRequires:  libwpd-devel >= 0.10
 BuildRequires:  libwpg-devel
-BuildRequires:  libwps-devel
+BuildRequires:  libwps-devel >= 0.4.0
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  lpsolve-devel
-BuildRequires:  mdds-devel >= 0.11.2
+BuildRequires:  mdds-devel >= 0.12.0
 BuildRequires:  npapi-sdk
 BuildRequires:  pentaho-libxml
 BuildRequires:  pentaho-reporting-flow-engine
@@ -964,7 +962,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch3 -p1
 %patch4
 %patch5
-%patch6 -p1
 %if !%{with systemlibs}
 %patch7 -p1
 %endif
@@ -1300,7 +1297,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
 # Remove RPATH on some 3rd party bundled libs
 %if !%{with systemlibs}
 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3.so.3
-chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.3.so.3
+chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.4.so.4
 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1
 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0
 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3

libwps-0.3.1.tar.bz2

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

libwps-0.4.0.tar.bz2

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