- Version update to 5.2.0.0.beta2:

* More bugfixes on road to 5.2 series
  * missing-include.patch

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

libreoffice-5.2.0.0.beta1.tar.xz

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

libreoffice-5.2.0.0.beta2.tar.xz

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

libreoffice-help-5.2.0.0.beta1.tar.xz

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

libreoffice-help-5.2.0.0.beta2.tar.xz

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

libreoffice-translations-5.2.0.0.beta1.tar.xz

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

libreoffice-translations-5.2.0.0.beta2.tar.xz

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

libreoffice.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 10 12:00:58 UTC 2016 - tchvatal@suse.com
+
+- Version update to 5.2.0.0.beta2:
+  * More bugfixes on road to 5.2 series
+  * missing-include.patch
+
 -------------------------------------------------------------------
 Thu Jun  2 12:07:43 UTC 2016 - tchvatal@suse.com
 

libreoffice.spec

@@ -30,7 +30,7 @@
 %bcond_with kdeintegration
 %endif
 Name:           libreoffice
-Version:        5.2.0.0.beta1
+Version:        5.2.0.0.beta2
 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
@@ -61,8 +61,6 @@ Source2004:     %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # PATCH-FIX-SUSE: disable really fragile test run on hsqldb
 Patch0:         disable-flaky-hsqldb-test.patch
-# PATCH-FIX-UPSTREAM: add missing include, already merged
-Patch1:         missing-include.patch
 # 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
@@ -908,7 +906,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %prep
 %setup -q -b1 -b2
 %patch0 -p1
-%patch1 -p1
 %patch3 -p1
 %patch4
 %patch5

missing-include.patch

@@ -1,29 +0,0 @@
-From 43144d4220fc45bf3bafcce387ff7f5b965bff92 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Mon, 30 May 2016 13:33:37 +0200
-Subject: Missing include
-
-Change-Id: Id61e2de27ec307fa7773d3f0d5a0810005f1c364
-(cherry picked from commit 336b62080bd06000e5ac3c7687b34bac2afc79a9)
-Reviewed-on: https://gerrit.libreoffice.org/25716
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-Tested-by: Stephan Bergmann <sbergman@redhat.com>
-
-diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
-index 8122424..5bd8a7e 100644
---- a/mysqlc/source/mysqlc_preparedstatement.cxx
-+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
-@@ -22,9 +22,9 @@
- #include "mysqlc_propertyids.hxx"
- #include "mysqlc_resultsetmetadata.hxx"
- 
-+#include <boost/config.hpp>
- #include <com/sun/star/lang/DisposedException.hpp>
- #include <com/sun/star/sdbc/DataType.hpp>
--
- #include <cppconn/connection.h>
- #include <cppconn/exception.h>
- #include <cppconn/parameter_metadata.h>
--- 
-cgit v0.10.2
-