- Update to 6.1.0.0.beta2:

* Various buildfixes as found by our testing
- Reenable KDE integration on 32bit
- Reenable firebird
- Drop merged patch libreoffice-libxmlsec.patch

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

libreoffice-6.1.0.0.beta1.tar.xz

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

libreoffice-6.1.0.0.beta1.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJbBvZyAAoJEPQ0oe+v7q6jpbAP/iQNDlVNSiyylxyIMYQLwUtQ
-kFff3Xc8zeJtDEmJLoXAx8SQ7jK63ZqNvRmxZhchg5X6EIcsHvgOEVV6gquatbBi
-FQcd3Yw8Zfkp0U1p3YdJOWB/skFsCuYoZVTrt3V6F+0/k6H9N7qp0aBQDvdAY8ly
-jOMmYoJuJrT/Gbdr4/QS0oxhdTgCf56jzAJT1kcW+EXjMFFHxdheKieE2bVhyRW5
-UeP43LUd3TFPTDYZDoDxzYTh3BoA3t/4NPuH9fClqk9ypzYC2E90561+fVcanReV
-xROZFYa3IpVVCA/E1FXaloTwiEHjOCoiTns1hRxh/flHX76YCewwK5kMzK9u2a2F
-aXkdN7XKM3Mzrld6ofyt3ZJ/usYjT/vCXojH9FB2PHlxhV+r6KmIo8N/N1ad/ZtA
-GK+KwkdmY8VR9+HNUXq5U2JntFwpoOQ+2cEmYA+mXEmj/bhTAjn/Q8QGjgHzKR78
-TFkIYiPpuqCM2OdHBUdUgrcyjY/2dfn71z7Ex+Jii3uAupmZotS4NlaTjk17PPjq
-ocBHGE38qKzY50HjbUZ4qTbIiNK/eu+PFpXr6uQ2lO98SbecDAzpbcRfMmDeWWcW
-Vm1JqypcDd63/IDZ2BhszcVl2jGYdkWn7yx2W0jn4FmkZ9DdmMPQEpB2jUN1xRa0
-SrPO4hpvDulp3qb974Zk
-=thzp
------END PGP SIGNATURE-----

libreoffice-6.1.0.0.beta2.tar.xz

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

libreoffice-6.1.0.0.beta2.tar.xz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJbIqwbAAoJEPQ0oe+v7q6jud8P/AgPhv82dhwmwb9IuJ6k2+Yg
+3qy9K26aGAnN4P4AGF3HraQOREpoacowdr0CcwPkFqBRV/e2eyl2OLcevsvuZJ8T
+s+2YHoHebfvgo71DR5Od6hL3ZCwAmnk6F1cVb+bk675zMru/DUmSx/KsszR+QfAf
+KQNGEFnzjcRbJ1jRQ+FzfT106d1fqFA1jtqSsYLeANucCSJm+m0fDIlFExLGQvTz
+QhP5u58cZruy3mue2957xE8MMfsvLgQ2XAPHMzHM40AVDXzX/OJ//1Pb3KV1nCyk
+lJdyuof8BcOYxz7NFW7szRZ4GnYOSvcL6cOROHQqUTWxqgNANKDD5eS+6OS7rUaE
+DwWX7wydrvaUgu5T6tksEhwttoRfp7vizROLxgdkJDBx8/i+R4qdqiOUWhKKVeQi
+0cG58/CrJW2G4LB+Mzrs3BMhakgTLzU0iIfgr9Hwapes8AR+IeqUB2FVqFeO95ZW
+5zLz0i3cTreCNmCIfHQjN5DuCCVdzHD/LxsV0Ia/zV4fmClNsPF9v2beqDbpUG/t
+rPFjuF4Wn+dpsfZTbjj3ewVaEfjAs+mWjsEpbNwMbRixPg5OirgX28CqkXFwe4/d
+3q06lXCfLAK5B7hVyR6d7JIeogBQg8Hd9dkj5nPwn8ikPzLqwki1vUiVrAabnFR+
+Mdp8r1EQxTtHBQGwF4D7
+=Z6o/
+-----END PGP SIGNATURE-----

libreoffice-help-6.1.0.0.beta1.tar.xz

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

libreoffice-help-6.1.0.0.beta1.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJbBvZ6AAoJEPQ0oe+v7q6jfIMP/14CUXMmp1iCbCsfn8VbXlVw
-gAJ9FGKxdYAXszQtdXW4WmWEk8jqbGxUhK/wF/OgrN4kUPLA7q+Ryjmg+gxutku+
-1rV2V1QHmZb6i03R38jApsOKDqIOuHQ5i1lJGFZib5k9mP8fdXangV/LY7FHcSQ/
-waJjxYgtnkq9rMnnH+Wv5wUZQkyzYaljPlhMsBl7HHJdxpeK/OStsWvNVzAXBqUk
-1fRHazaDBvmFcHnO+zIcAPXVXnC0HUqkpfcBkncnfHN6zyfNNsHDsalS+kvVCR1M
-Z9hwHgr8Ht/tprHr9hmHdfeMouGJLwaSnIhFNwylUIyjrhyWjUwLP7+TLE7kkAfV
-JbPt+DvdV/+PLbWlrgeZJSlmcCQMF5K040ybWb2BYAmN/eBpEAogA/v9SX8Dag5f
-mzuJVbEC92w6KPgJTY78b7CMnJcyHoGCiPGkTfuYM09yXJZqZXPl9nCK0aAVH3g4
-fz+qXsHRGbU6/8SEydqV1q31/KxEUZ80G2rHReN0Dw3iHv+5n4ufleY4sRlTTZRm
-yvV4i/STsjR0D58elf3tP2/qdmNnGgKVrPnsP5xjS4c6IcJUN6Tsbf635qopqJIk
-9sQNYCVCDeooiKS/68G/zyeTvLCYSVgV3iyGg2ZyWjJatBLdmQK3GtG5JiC/nn42
-jYrdl0FlfNRuI/HCcVk+
-=8/K8
------END PGP SIGNATURE-----

libreoffice-help-6.1.0.0.beta2.tar.xz

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

libreoffice-help-6.1.0.0.beta2.tar.xz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJbIqwtAAoJEPQ0oe+v7q6jQVoP/jxW7Btr/WM7iLE/KPrNzB1s
+l0dvmnh0nRoSbe8kr7+d28cJv4SWHRzl6zLjq9P4B68PIPAqmJt4RmjNLsyh8PdE
+Lh0IzKWHMZmzVA5p6EKJ/NdZXVGaE69pPgJj/B1TBxPVDbenaFUhAW5DZB/m40TL
+QzFrbGvtFTUf5kXZ+BkGx7PupCMCJ+BIJladjUVqgueQOodnC3SuRVwFuRb/sWDo
+w2dsDrSCbLpxeekWY1dUl+r6iYWsruAzKhTmvkG9AfnFtN03e10kaF2RZcJadTlN
+FrZmjYeT7CPF9ul//xZN3OGfPH/A1Wl0ndUAtdNJ+mCS8dcNuIdgi3Y95Ivo3Ckn
+GE6dSrI8xdPqhkyQYPPQ0hqYGuYBBjpykBzFwkcvBEFtR2J9+Jmo18QTMtyf33QY
+b/xRTsdJrGilD9OV8aDasBgBh747yR7qsE8zqLZ3dQa0MkrBmjyaaFJq1kZgWaj3
+6NrizbOMIS6HbVx65pdrohjQLT/bEIq09JJToLbI2VvX8aOQAbHwY7G8epfe17SJ
+zy7D96cF5dikhjhCl1K7Cwa7BCjmK01p87DbpSrBW/P4Y57Hd96j7BSDZrEjw8oF
+rJcxAiC/W7hLzxZD0En3fj8Fa9SfDbbMm/npXW7m2Rndms3TpuOlDE17EWRdIwcB
+tKtDJK7G6BttfTng8rbp
+=5L9n
+-----END PGP SIGNATURE-----

libreoffice-libxmlsec.patch

@@ -1,39 +0,0 @@
-diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
-index de32f8286c1b..83dd83e66a25 100644
---- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
-+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
-@@ -157,6 +157,25 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks()
-         //Notes: all none default callbacks will lose.
-         xmlSecIOCleanupCallbacks() ;
- 
-+        // Newer xmlsec wants the callback order in the opposite direction.
-+#if XMLSEC_VERSION_MAJOR > 1 || (XMLSEC_VERSION_MAJOR == 1 && XMLSEC_VERSION_MINOR > 2) || (XMLSEC_VERSION_MAJOR == 1 && XMLSEC_VERSION_MINOR == 2 && XMLSEC_VERSION_SUBMINOR >= 26)
-+        //Register the default callbacks.
-+        //Notes: the error will cause xmlsec working problems.
-+        int cbs = xmlSecIORegisterDefaultCallbacks() ;
-+        if( cbs < 0 ) {
-+            return -1 ;
-+        }
-+
-+        //Register my classbacks.
-+        cbs = xmlSecIORegisterCallbacks(
-+                    xmlStreamMatch,
-+                    xmlStreamOpen,
-+                    xmlStreamRead,
-+                    xmlStreamClose ) ;
-+        if( cbs < 0 ) {
-+            return -1 ;
-+        }
-+#else
-         //Register my classbacks.
-         int cbs = xmlSecIORegisterCallbacks(
-                     xmlStreamMatch,
-@@ -173,6 +192,7 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks()
-         if( cbs < 0 ) {
-             return -1 ;
-         }
-+#endif
- 
-         enableXmlStreamIO |= XMLSTREAMIO_INITIALIZED ;
-     }
-

libreoffice-translations-6.1.0.0.beta1.tar.xz

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

libreoffice-translations-6.1.0.0.beta1.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJbBvZ+AAoJEPQ0oe+v7q6jFbwQAJZNbUrKR4thLBiBPKWqQkh3
-Ci088rbXgez1I0msTxl9+bbf9PYSaEqoZKGpx3+ez4kivR372tG5IGjg5nx8BYCx
-o5YSc5UzGf8nZxWZIMgwBqEoBfC8OFvDaQeZ7GPtQDYLfCb0FAAUvevn175Mh+Mj
-Di4Sk5Bu1kXYwa1Itn6rT2OVlLERBkT8iE02X4yOGZEcpoTVohkEuyAohf56VYDV
-xDWvGQg/uxUq8A4kRL7qfMwbIvGJZ/fBEYlGRcL/gYz1TMeXFcDCfTJ7NDs3xbP1
-QEeiAhUuU/HK08+ODPehW49GXhXrh7OXl5Wd+zBEIkXmXn7Qci68k9fMytzvyU0E
-Tio0Yk0MCEgbdguOZ/+PkK7+vzCAJzg+lXttsyj1jNeUWjq8rW2dgw6mAC4DZR/E
-TyjRLncoAuMpqyHGIrzn6kHivmwMTczFjB2jZ4YYS2LL6aAmmbETsuKbBiHKl8M8
-HC7LNxwHU//ZiY2nix0E+r2NspE/jd8k3p5JB9JN1QqNnUnVChjfeq6V2qvPgbTr
-sI4/GPbGUgpw+RcsOBZL7QHlF889bznBr2E4iEZuhsB81kpUW5pOSDUOaAt3sjbE
-vMfmZ26ZGKux/VQDg4DPUipZoo8OSsMZZhEm3IrnO6Wsy63juxkV7QlyMJ3uR9+n
-26G8YfkIwWfmONqnLCG0
-=d1qm
------END PGP SIGNATURE-----

libreoffice-translations-6.1.0.0.beta2.tar.xz

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

libreoffice-translations-6.1.0.0.beta2.tar.xz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJbIqwtAAoJEPQ0oe+v7q6j75wP/RwxxF5YlzmyEQtpCnnGrgPv
+iQ29aewAnxtFTgnn+nlqEKgc0K0Br9TyTtP35Ss0qmBmyeF2Z0d3YRVDSQdV2S8G
+X7L48nZxRS0IHABEMeK5ziSdq3XkYEwp3YEbXKH8RamMTsMQo9CsetWQnSpQQ9uO
++JQBGmzDZzCuf/NlDpjUDNaBuQinUTX141U+Ev4UdtLQJSuQL5RffzjJpJLY8V0T
+TmDqwy1pMfP0ih4NmTPOwzYsWJJ65xMFrbEVKTNZwmgpKVENebs4Ah9H8/bRcNvC
+LL2HK90I9+Ihepra1LXJOPUXppMlvAwKOBG5NvwMz0fq1Hf67rw6vM28DjIlx+qK
+PHdfvU5iny1fKOt+s6fziVY7aIvnvmxftFRvtgp2J7umT9ZIVlcQ+KgkO1LXMtCM
+UG6+RUG9lN+sV5d3tsP/AB5cI81bD+nChHknQVwMjxyEXfZzZPFYCu8NhJqXYiur
+GM0WpsohlMfiuHp4jHaOWrJxBvDPmR9uUqAOCWf4Yad0/z3dRcWkt8IsUEccLMpR
+zKPBeiIoZwkew8wg9KHp5uqFrHCKHzzBVrrUdZA4xn36l+rDqIBqV2V+IxvWg/ql
+Xde5z63jFUS80H+lHt2VdvmYgHxq1458F+YgQ+Z1jcospVML7/TBEScdNL7BHyAL
+p85Y4gLwkmwYoOttJZaS
+=aoFD
+-----END PGP SIGNATURE-----

libreoffice.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jun 15 09:40:55 UTC 2018 - tchvatal@suse.com
+
+- Update to 6.1.0.0.beta2:
+  * Various buildfixes as found by our testing
+- Reenable KDE integration on 32bit
+- Reenable firebird
+- Drop merged patch libreoffice-libxmlsec.patch
+
 -------------------------------------------------------------------
 Tue Jun 12 13:04:49 UTC 2018 - tchvatal@suse.com
 

libreoffice.spec

@@ -22,8 +22,8 @@
 %define         numbertext_version 0.9.5
 # Urls
 %define external_url https://dev-www.libreoffice.org/src/
-%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.1.0
+#%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.1.0
-#%define tarball_url  https://dev-builds.libreoffice.org/pre-releases/src/
+%define tarball_url  https://dev-builds.libreoffice.org/pre-releases/src/
 # LTO needs newer toolchain stack only
 %if 0%{?suse_version} >= 1500
 %bcond_without lto
@@ -32,17 +32,12 @@
 %endif
 # Enable the kde integration on openSUSE only
 %if 0%{?is_opensuse}
-# for some reason breaks on 32bit
-%ifarch %ix86
-%bcond_with kdeintegration
-%else
 %bcond_without kdeintegration
-%endif
 %else
 %bcond_with kdeintegration
 %endif
 %if 0%{?suse_version} > 1320 && 0%{?is_opensuse}
-%bcond_with firebird
+%bcond_without firebird
 %else
 %bcond_with firebird
 %endif
@@ -59,7 +54,7 @@
 %bcond_with gtk3
 %endif
 Name:           libreoffice
-Version:        6.1.0.0.beta1
+Version:        6.1.0.0.beta2
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0-or-later AND MPL-2.0+
@@ -109,7 +104,6 @@ Patch3:         mediawiki-no-broken-help.diff
 # Fix java detection on pcs with 99+ cpus, it prints too many warnings and then
 # math does not work
 Patch4:         libreoffice-java-sched.patch
-Patch5:         libreoffice-libxmlsec.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
@@ -909,7 +903,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch2
 %patch3
 %patch4 -p1
-%patch5 -p1
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)